1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/ground/openpilotgcs
Mike LaBranche bf591ebe45 Merge branch 'next' into MikeL
Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 15:38:57 -07:00
..
bin build: Move openpilotgcs into its own subdirectory 2011-01-22 17:40:26 +00:00
share Modified svg text field sizes to be a bit more aesthetic. 2012-04-28 11:11:57 -04:00
src Merge branch 'next' into MikeL 2012-06-04 15:38:57 -07: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