Stephen Birarda 8c6715e4fc resolve conflicts on merge with upstream/master		2015-05-11 11:10:22 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
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	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge pull request #4819 from ZappoMan/moreZoneProperties	2015-05-11 19:38:27 +02:00
entities-renderer	Remove change that doesn't belong in this branch.	2015-05-11 10:17:31 -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	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -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	CR	2015-05-11 14:31:22 +02:00
script-engine	Merge pull request #4795 from birarda/sequence-numbers	2015-05-11 19:23:33 +02:00
shared	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -07:00
ui	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00