David Rowe b70c1a4960 Merge branch 'master' into 20639		2015-08-07 12:33:13 -07:00
..
animation	Don't let individual startAnimation get messed up by blend/fade.	2015-08-06 11:30:18 -07:00
audio
audio-client	Fix https://app.asana.com/0/32622044445063/43589567731045	2015-08-02 21:46:39 -07:00
auto-updater
avatars	Merge branch 'master' into 20639	2015-08-04 18:36:53 -07:00
embedded-webserver
entities	Merge pull request #5494 from sethalves/gzip-json-entity-persist-files	2015-08-05 10:56:03 -07:00
entities-renderer	remove glLineWidth completely because it s not available anymore for wide lines in core	2015-08-04 11:57:20 -07:00
environment
fbx	cleaning th ecode	2015-08-06 18:53:21 -07:00
gpu	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
model	Merge remote-tracking branch 'upstream/master' into core	2015-08-01 20:01:59 -07:00
networking	clean up formatting, make connectionUUID const in NodeList	2015-08-06 10:11:22 -07:00
octree	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
physics
render	removing dead code	2015-08-04 16:37:01 -07:00
render-utils	cleaning th ecode	2015-08-06 18:54:58 -07:00
script-engine	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -07:00
shared	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
ui