Brad Davis f22682fe39 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h		2015-06-01 22:59:10 -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	look for connection steps in LimitedNodeList	2015-05-27 15:54:39 -07:00
avatars	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
display-plugins	Trying to get widgets / windows working	2015-06-01 17:31:18 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	Merge pull request #4994 from AndrewMeadows/isentropic	2015-05-29 16:07:10 -07:00
entities-renderer	Remove debug print.	2015-05-29 16:21:57 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	don't allow buildModelMesh to spam logs when it encounters flawed models	2015-05-14 10:24:02 -07:00
gpu	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
model	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
networking	remove extra debug	2015-05-29 13:21:24 -07:00
octree	CR comments	2015-05-29 12:45:03 -07:00
physics	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
plugins	Consolidating GL display plugins	2015-05-31 00:24:19 -07:00
render-utils	Trying to get widgets / windows working	2015-06-01 17:31:18 -07:00
script-engine	Uglify conditional returns. :-)	2015-05-26 11:38:36 -07:00
shared	Adding missing files	2015-05-29 12:59:55 -07:00
ui	Add new address bar dialog error message	2015-06-01 09:01:11 -07:00