Brad Hefta-Gaub e93326e43f Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings		2015-10-07 15:49:46 -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	Merge pull request #5974 from Atlante45/extra_debug	2015-10-01 14:42:45 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings	2015-10-07 15:49:46 -07:00
ui	save sixense settings and some UI cleanup	2015-10-07 14:19:15 -07:00
CMakeLists.txt	add GLEW_STATIC to fix link warnings	2015-10-02 15:08:04 -07:00