1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
chris pember ee031fe80d Merge branch 'next' into cp/extraGUIchanges
Conflicts:
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowseroptionspage.ui
2012-10-07 10:32:21 -07:00
..