James Cotton 75db0fcb35 Merge branch 'next' into revo ... Conflicts: flight/Modules/GPS/GPS.c shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/systemalarms.xml		2012-08-12 14:38:38 -05:00
..
linux	Fixed borkage in the rules file where the if test was malformed. Added	2012-01-04 21:39:23 -07:00
osx	Work on the OSX packaging to get it working for revo and to package OSG.	2012-06-13 12:30:07 -05:00
winx86	AeroSimRC: add plugin option to Windows installer	2012-07-20 22:37:36 +03:00
Makefile	For now disable the bootloader updaters from being built with packaging. They	2012-06-13 02:58:44 -05: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