overte-HifiExperiments/interface
Triplelexx 949eab62ec Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769
# Conflicts:
#	libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp

removed deviceID
2016-02-21 22:04:14 +00:00
..
external Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
i18n Updated english translation file 2015-10-15 11:15:06 -07:00
icon
resources Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769 2016-02-21 22:04:14 +00:00
src Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769 2016-02-21 22:04:14 +00:00
ui Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
CMakeLists.txt Add BugSplat to interface 2016-02-09 10:48:32 -08:00