Stacey Sheldon 54a161a3d4 Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: shared/uavobjectdefinition/manualcontrolsettings.xml		2012-07-08 18:14:09 -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	Add "OpenPilotGCS (clean configuration)" Windows shortcut to reset GCS configuration	2012-06-25 12:07:26 +03:00
Makefile	Merge remote-tracking branch 'op-public/next' into revo-next	2012-06-10 19:01:11 -04:00
Makefile.linux	Fixed borkage in the rules file where the if test was malformed. Added	2012-01-04 21:39:23 -07: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