Stacey Sheldon 754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: flight/Modules/ManualControl/inc/manualcontrol.h flight/Revolution/Makefile.osx ground/openpilotgcs/src/plugins/plugins.pro ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-09-16 09:56:35 -04:00
..
linux	Fixed borkage in the rules file where the if test was malformed. Added	2012-01-04 21:39:23 -07:00
osx	Make packaging on OSX include all pipxtremem compiled opfw in the packaging directory	2012-06-07 12:39:00 -05:00
winx86	Windows Installer: regression fix (really uninstall GCS configuration)	2012-09-01 14:32:09 +03:00
Makefile	bu targets fix	2012-07-30 11:41:10 +03:00
Makefile.linux	Allow building an unsigned linux package until we have official OP signing keys	2012-07-18 17:01:39 -05:00
Makefile.osx	OSX Packaging: Go back to release configuration for build	2011-08-04 20:54:59 -05:00
Makefile.winx86	package: now it is called 'make package' instead of 'make release'	2011-05-28 03:14:51 +03:00