LibrePilot

mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-21 13:28:58 +01:00

Go to file

Fredrik Arvidsson bd3d3708eb Merge branch 'next' into thread/OP-39

Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
	ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
	ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc

2012-09-16 15:14:47 +02:00

androidgcs

Update android objects

2012-09-12 02:36:33 -05:00

artwork

AndroidGCS PFD: Update the graphics for the PFD

2012-08-30 01:01:53 -05:00

flight

PID: Fix small bug in setpoint weighting that had really ugly consequences

2012-09-12 00:07:17 -05:00

ground

Merge branch 'next' into thread/OP-39