Atlante45 f47620231e Entities have user data		2014-11-13 16:16:20 -08:00
..
animation	cleanup	2014-11-12 16:57:42 -08:00
audio	fix for AudioInjector QScriptValue conversion typos	2014-11-11 20:48:34 -08:00
avatars	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
embedded-webserver
entities	Entities have user data	2014-11-13 16:16:20 -08:00
fbx
metavoxels
networking	Entities have user data	2014-11-13 16:16:20 -08:00
octree	suppress some potentially repeated log messages	2014-11-13 07:52:00 -08:00
physics
script-engine	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-13 11:04:12 -08:00
voxels	fix a bug produced by not setting deleted var to NULL	2014-11-10 11:03:15 -08:00