Stephen Birarda d9f445d5f6 put custom hashing for UUID in UUIDHasher		2015-08-17 16:45:15 -07:00
..
animation	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-08-04 16:06:38 -07:00
audio
audio-client	Fix https://app.asana.com/0/32622044445063/43589567731045	2015-08-02 21:46:39 -07:00
auto-updater
avatars	resolve conflicts on merge with upstream master	2015-08-05 11:16:20 -07:00
embedded-webserver
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-08-05 11:16:34 -07:00
entities-renderer	resolve conflicts on merge with upstream master	2015-08-05 11:16:20 -07:00
environment
fbx	merge master into cleanup of legacy shapes	2015-08-03 11:19:29 -07:00
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-08-04 10:51:23 -07:00
model	change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive	2015-08-01 11:29:28 -07:00
networking	put custom hashing for UUID in UUIDHasher	2015-08-17 16:45:15 -07:00
octree	move hasher for UUID to UUID.h	2015-08-17 16:39:52 -07:00
physics
render	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-08-04 16:06:38 -07:00
script-engine	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -07:00
shared	remove msecTimestampNow that is not used	2015-08-17 16:39:29 -07:00
ui