James Cotton bb0bfe0ae4 Merge branch 'next' into revolution3 ... Conflicts: flight/Bootloaders/CopterControl/Makefile flight/Bootloaders/PipXtreme/Makefile flight/Bootloaders/Revolution/inc/pios_config.h flight/CopterControl/Makefile flight/INS/inc/pios_config.h flight/Libraries/taskmonitor.c flight/Modules/Altitude/altitude.c flight/Modules/Attitude/attitude.c flight/OpenPilot/Makefile flight/OpenPilot/Makefile.posix flight/OpenPilot/System/inc/pios_usb_board_data.h flight/OpenPilot/System/inc/taskmonitor.h flight/OpenPilot/System/pios_board.c flight/OpenPilot/System/taskmonitor.c flight/PiOS/Boards/STM32F4xx_Revolution.h flight/PiOS/STM32F4xx/pios_bmp085.c flight/PiOS/STM32F4xx/pios_iap.c flight/PiOS/pios.h flight/Revolution/System/inc/pios_config.h flight/Revolution/System/inc/taskmonitor.h flight/Revolution/System/taskmonitor.c ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp shared/uavobjectdefinition/systemalarms.xml shared/uavobjectdefinition/taskinfo.xml		2012-01-21 11:27:03 -06:00
..
app	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
experimental	This should fix the upload CLI tool.	2011-05-23 11:55:09 +01:00
libs	OP-608	2012-01-10 17:03:58 +00:00
plugins	Merge branch 'next' into revolution3	2012-01-21 11:27:03 -06:00
shared	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00
openpilotgcslibrary.pri	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
openpilotgcsplugin.pri	OP-520 Change $$qtLibraryTarget to $$qtLibraryName	2011-08-04 15:17:08 +02:00
rpath.pri	On OSX make the plugins in .app/Contents/Plugins instead of PlugIns	2011-06-01 13:58:49 -05:00
src.pro	build: Move openpilotgcs into its own subdirectory	2011-01-22 17:40:26 +00:00