Atlante45 c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11		2014-12-16 15:42:40 -08:00
..
animation	DM users update	2014-12-16 15:32:11 -08:00
audio	Fixes for missing audio device.	2014-12-15 22:41:35 -08:00
avatars	No more .f	2014-11-19 16:53:39 -08:00
embedded-webserver
entities	convert AnimationCache to DependencyManager	2014-12-15 19:48:15 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-10 15:23:27 -08:00
gpu	add windowshacks.h to GPUConfig.h and move it to shared	2014-12-15 11:49:01 -08:00
metavoxels	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
networking	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-16 15:42:40 -08:00
octree	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
physics	No more .f	2014-11-19 16:53:39 -08:00
render-utils	DM users update	2014-12-16 15:32:11 -08:00
script-engine	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-16 15:42:40 -08:00
shared	Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11	2014-12-16 15:42:40 -08:00
voxels	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00