Atlante45 0cc4f5b226 Merge branch 'android' of git://github.com/birarda/hifi into android		2015-01-30 13:30:17 -08:00
..
animation
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-28 13:13:32 -08:00
audio-client	move a couple avatar initialisations outside avatar maanger	2015-01-29 16:00:57 -08:00
avatars	Re-add accidentally removed int size()	2015-01-30 11:41:14 -08:00
embedded-webserver
entities	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-30 12:02:11 -08:00
environment
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-28 13:13:58 -08:00
gpu	Merge branch 'android' of git://github.com/birarda/hifi into android	2015-01-30 13:30:17 -08:00
metavoxels	Merge pull request #4131 from Atlante45/pull_out_menu_mess	2015-01-27 16:23:23 -08:00
model
networking	show GVRInterface in full screen on Android	2015-01-30 10:16:48 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-28 13:13:32 -08:00
physics	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
render-utils	Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval	2015-01-30 10:21:18 -08:00
script-engine	Add comment to ScriptEngine::include()	2015-01-29 09:08:55 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-30 12:02:11 -08:00