1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
LibrePilot/ground
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
..
openpilotgcs Merge branch 'revo' into revo-mini 2012-09-01 16:57:27 -05:00
uavobjects GCS - Strangely QtCreator builds stopped working for me after compiling Wireshark on Ubuntu. 2012-07-09 14:52:41 +01:00
uavobjgenerator Update the UAVObjects to the version on next. At some point a make script 2012-08-06 16:54:54 -05:00
ground.pro Change reference to svn by git (in comments, no code change) 2011-04-24 20:23:20 +03:00