Brad Davis 59b8b80148 Merge remote-tracking branch 'upstream/master' into vr_menus ... Conflicts: interface/src/Menu.cpp		2015-04-27 16:02:13 -07:00
..
animation
audio	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
audio-client	less loud generated noise	2015-04-15 16:22:52 +02:00
avatars	fix default avatars on first run	2015-04-24 11:30:18 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	merge from upstream	2015-04-27 09:57:36 -07:00
entities-renderer	merge from upstream	2015-04-27 09:57:36 -07:00
environment
fbx	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
gpu	respond to code-review	2015-04-25 10:50:18 -07:00
model	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
networking	respond to code-review	2015-04-25 10:50:18 -07:00
octree	fix bug in parsing root element data	2015-04-27 15:07:32 -07:00
physics	fix bug caused by no-longer reusing a variable	2015-04-27 12:20:01 -07:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 12:20:58 -07:00
script-engine	more details in the comments	2015-04-21 11:12:01 -07:00
shared	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 12:20:58 -07:00
ui	Mac testing	2015-04-27 12:46:34 -07:00