Seth Alves fedbfe8881 fix jumbled merge		2015-08-11 11:00:04 -07:00
..
animation	Merge pull request #5545 from AndrewMeadows/chlorine	2015-08-11 09:19:16 -07:00
audio	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
audio-client	Fix https://app.asana.com/0/32622044445063/43589567731045	2015-08-02 21:46:39 -07:00
auto-updater
avatars	Merge howard/rig into andrew/caesium	2015-07-29 09:04:32 -07:00
embedded-webserver
entities	quiet compiler	2015-08-11 10:12:46 -07:00
entities-renderer	Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization	2015-08-10 15:10:12 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	quiet compiler	2015-08-11 10:12:46 -07:00
gpu	fix jumbled merge	2015-08-11 11:00:04 -07:00
model	Merge remote-tracking branch 'upstream/master' into core	2015-08-01 20:01:59 -07:00
networking	missed this in the last commit -- bump protocol version	2015-08-10 15:15:54 -07:00
octree	no longer returning early on NaN	2015-08-07 16:15:51 -07:00
physics	quiet compiler	2015-08-11 10:22:56 -07:00
render	removing dead code	2015-08-04 16:37:01 -07:00
render-utils	quiet compiler	2015-08-11 10:12:46 -07:00
script-engine	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -07:00
shared	quiet compiler	2015-08-11 10:22:56 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00