Brad Davis 52c65b917f Merge remote-tracking branch 'upstream/master' into controllers		2015-10-10 12:48:49 -07:00
..
external	Update readme.txt	2015-09-15 00:29:12 +02:00
i18n	moved translation efforts into subdir	2015-08-25 01:36:19 +02:00
icon
resources	Fixing json issues	2015-10-09 17:37:51 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface	2015-10-10 09:33:55 -07:00
ui	save sixense settings and some UI cleanup	2015-10-07 14:19:15 -07:00
CMakeLists.txt	Prototyping controllers	2015-10-09 16:20:55 -07:00