Andrew Meadows ba873deb49 ignore Entity updates that don't change anything		2014-12-30 11:38:24 -08:00
..
animation	merging with upstream master and origin temp0	2014-12-22 10:38:11 -08:00
audio	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
avatars	merge upstream/master into andrew/inertia	2014-12-29 09:15:49 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	ignore Entity updates that don't change anything	2014-12-30 11:38:24 -08:00
entities-renderer	Merge pull request #3989 from birarda/master	2014-12-21 11:34:43 -08:00
fbx	merging with upstream master and origin temp0	2014-12-22 10:38:11 -08:00
gpu	fixed pointers which were using 0 instead of NULL and syntax in resource.h	2014-12-22 11:20:04 -08:00
metavoxels	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-19 12:50:32 -08:00
octree	merge upstream/master into andrew/inertia	2014-12-29 09:15:49 -08:00
physics	add comment about stubbed ObjectMotionState	2014-12-29 16:41:27 -08:00
render-utils	remove GLUT from Cmake files	2014-12-19 10:53:36 -08:00
script-engine	fix typo in cmakelists	2014-12-22 11:03:08 -08:00
shared	fix bug in != operator	2014-12-29 10:50:06 -08:00
voxels	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00