overte/libraries
ZappoMan cfa5e5c61b Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-19 10:35:18 -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 Fix avatar hand state decoding for finger laser 2014-12-11 23:07:05 -08:00
embedded-webserver Replacing glutSolidSphere by a cached Geometry 2014-10-03 16:55:58 -07:00
entities fixing derived classes to use new EntityItem API 2014-12-18 11:41:20 -08:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-12-19 10:35:18 -08:00
fbx remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00
gpu remove all glut 2014-12-18 16:12:30 -08:00
metavoxels fix indentation in MetavoxelClientManager 2014-12-18 11:30:57 -08:00
networking include QUuid instead of UUID in UUIDHasher 2014-12-18 14:31:34 -08:00
octree remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00
physics No more .f 2014-11-19 16:53:39 -08:00
render-utils remove all glut 2014-12-18 16:12:30 -08:00
script-engine Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-12-19 10:35:18 -08:00
shared Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
voxels remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00