Brad Davis d7a850d7be Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix ... Hifi 3 d connexion cmake fix		2015-09-14 18:53:39 -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 branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
src	Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix	2015-09-14 18:53:39 -07:00
ui	apperance => appearance	2015-08-13 14:42:37 -07:00
CMakeLists.txt	Procedural skybox work	2015-09-08 14:31:16 -07:00