Stacey Sheldon f5db83bd20 Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: flight/Libraries/inc/NMEA.h flight/Modules/GPS/GPS.c flight/Modules/GPS/NMEA.c flight/Modules/GPS/UBX.c flight/Modules/GPS/inc/NMEA.h flight/Modules/GPS/inc/UBX.h flight/Modules/PathPlanner/inc/pathplanner.h flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld flight/Revolution/System/inc/pios_config.h flight/Revolution/UAVObjects.inc flight/SimPosix/UAVObjects.inc ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro shared/uavobjectdefinition/gpsvelocity.xml		2012-07-22 23:39:37 -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	AeroSimRC: add plugin option to Windows installer	2012-07-20 22:37:36 +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