Atlante45 f914f02a0b Move user data to end of enum		2014-11-13 17:44:22 -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	Move user data to end of enum	2014-11-13 17:44:22 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
metavoxels	Removed unused variable, fixed painting materials on heightfields with greater	2014-10-30 18:05:40 -07:00
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	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
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