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
..
src/controllers	Merge branch 'master' into 21418	2017-07-01 11:19:00 +12:00
CMakeLists.txt	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00