Andrew Meadows 11f01e1859 merge upstream/master into andrew/inertia		2014-12-18 15:01:08 -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	moving Shape* back into shared lib	2014-12-01 16:03:14 -08:00
embedded-webserver
entities	simpler EntityItem::simulate() bypass for bullet	2014-12-18 13:56:18 -08:00
entities-renderer	merge upstream/master into andrew/inertia	2014-12-18 15:01:08 -08:00
fbx	remove quotes from library links for debug/optimized	2014-12-18 09:38:48 -08:00
gpu	DRY up gpu library/header linking	2014-12-18 09:14:44 -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	merge upstream/master into andrew/inertia	2014-12-18 15:01:08 -08:00
physics	remove test hack for higher than normal ground	2014-12-17 14:17:30 -08:00
render-utils	duh, glut only required on win	2014-12-18 09:50:10 -08:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 16:47:15 -08:00
shared	merge upstream/master into andrew/inertia	2014-12-18 15:01:08 -08:00
voxels	remove quotes from library links for debug/optimized	2014-12-18 09:38:48 -08:00