Seth Alves 8a60bba4eb Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers		2015-09-08 15:28:46 -07:00
..
external
i18n	moved translation efforts into subdir	2015-08-25 01:36:19 +02:00
icon
resources	Avatar animations on by default. (Using the now old animation machinery.)	2015-09-04 14:24:37 -07:00
src	octree uses shared pointers	2015-09-08 11:59:48 -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