James Cotton 93faf131b0 Merge branch 'next' into revo ... Conflicts: 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/Revolution/System/inc/pios_config.h flight/Revolution/UAVObjects.inc ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro ground/openpilotgcs/src/plugins/waypointeditor/waypointeditorplugin.h shared/uavobjectdefinition/gpsvelocity.xml		2012-07-22 00:43:19 -05:00
..
bin	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00
share	Updated to use html file as source of popup text. Updated to latest system health svg file. Support popup for actuator critical.	2012-06-26 22:14:56 +01:00
src	Merge branch 'next' into revo	2012-07-22 00:43:19 -05:00
copydata.pro	Need to link a few new libraries for the QML stuff (windows)	2012-02-16 01:16:09 +02:00
openpilotgcs.pri	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
openpilotgcs.pro	OP-483: remove gcs/packaging subdirectory (not required anymore)	2011-05-19 13:08:54 +03:00