1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
LibrePilot/ground/openpilotgcs
James Cotton c9f66f5145 Merge branch 'revo' into revo-mini
Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/values/strings.xml
	androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
	androidgcs/src/org/openpilot/androidgcs/HomePage.java
	flight/PipXtreme/System/pios_board.c
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
2012-09-01 16:57:27 -05:00
..
bin build: Move openpilotgcs into its own subdirectory 2011-01-22 17:40:26 +00:00
share Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module 2012-08-01 19:53:59 +09:30
src Merge branch 'revo' into revo-mini 2012-09-01 16:57:27 -05:00
copydata.pro Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-29 23:59:54 +03: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