David Rowe 07697c5083 Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.		2017-07-01 11:19:00 +12:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge branch 'master' into 21418	2017-07-01 11:19:00 +12:00
src	Merge branch 'master' into 21418	2017-07-01 11:19:00 +12:00
ui
CMakeLists.txt	more memory-debugger	2017-06-23 08:16:48 -07:00
interface.exe.manifest