James Cotton 21a71e5294 Merge branch 'master' into spin_while_armed ... Added back the "Spin arming" button to output panel and made it work Conflicts: ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp ground/openpilotgcs/src/plugins/config/output.ui		2011-05-05 00:23:51 -05:00
..
bin	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00
packaging	Change version info scripts to use git instead of SubWCRev svn utility	2011-04-24 20:15:59 +03:00
share	Default background less crowded and cleaner	2011-05-04 13:07:22 +10:00
src	Merge branch 'master' into spin_while_armed	2011-05-05 00:23:51 -05:00
openpilotgcs.pri	Windows GCS installer cleanup.	2011-01-24 19:27:49 +00:00
openpilotgcs.pro	Windows installer and build scripts: few minor changes (listed below), no code change.	2011-01-28 18:18:08 +00:00