Merge remote-tracking branch 'origin/filnet/OP-1351_calibration_ui_polishing' into filnet/OP-1351_calibration_ui_polishing

Browse Source

Conflicts:
	ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/config/configrevowidget.h
	ground/openpilotgcs/src/plugins/config/revosensors.ui

...

This commit is contained in:

Philippe Renon 2014-05-23 09:29:54 +02:00

parent 9a1a43186a 803647cef7

commit c799d8f90e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available