Brad Davis 6a5c7b8b42 Merge remote-tracking branch 'upstream/master' into plugins_pt2 ... Conflicts: libraries/script-engine/src/MenuItemProperties.cpp		2015-05-11 12:40:17 -07:00
..
animation
audio	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
audio-client	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
avatars	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
embedded-webserver
entities	Merge pull request #4819 from ZappoMan/moreZoneProperties	2015-05-11 19:38:27 +02:00
entities-renderer	Put back the script-fix that belongs in this branch.	2015-05-11 11:53:48 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting (http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj).	2015-05-09 13:16:34 -07:00
gpu	quiet compiler	2015-05-10 17:03:42 -07:00
model	Cleaning code	2015-05-07 17:15:45 -07:00
networking	Merge pull request #4816 from ctrlaltdavid/fix-pragma	2015-05-11 12:30:54 -07:00
octree	undo mistaken change of setting name	2015-05-09 17:59:45 -07:00
physics	clear MotionState pointer in body on delete	2015-05-08 14:18:44 -07:00
render-utils	Merge remote-tracking branch 'upstream/master' into plugins_pt2	2015-05-11 12:40:17 -07:00
script-engine	Merge remote-tracking branch 'upstream/master' into plugins_pt2	2015-05-11 12:40:17 -07:00
shared	Merge pull request #4791 from jherico/scale	2015-05-08 15:54:24 -07:00
ui	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00