Sam Gateau 8944bdd1e5 COmment out problems		2015-02-13 02:17:08 -08:00
..
animation
audio	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
audio-client	Fix reverb memory leak	2015-02-10 19:25:12 +01:00
avatars	specify QScriptable include under QtScript	2015-02-04 11:08:26 -08:00
embedded-webserver
entities	give TextEntityItem a box collision shape	2015-02-12 08:28:34 -08:00
entities-renderer	fix the quad color being broken after rendering text	2015-02-11 15:50:04 -08:00
environment
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-13 01:33:21 -08:00
gpu	COmment out problems	2015-02-13 02:17:08 -08:00
metavoxels	Settings update	2015-02-03 12:27:30 -08:00
model	Support include path to shaders from the hifi libraries to cmake	2015-02-13 01:30:04 -08:00
networking	merge upstream/master into andrew/thermonuclear	2015-02-11 13:35:28 -08:00
octree	merge upstream/master into andrew/thermonuclear	2015-02-09 12:44:52 -08:00
physics	don't create shape for SHAPE_TYPE_NONE	2015-02-11 08:43:55 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-13 01:33:21 -08:00
script-engine	replace data with metaverse for highfidelity urls	2015-02-10 10:05:38 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-13 01:33:21 -08:00