Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next
commitf2a431acebf83955a667e0168033441976d5a488
authorLaurent Lalanne <f5soh@free.fr>
Mon, 20 Apr 2015 12:35:08 +0000 (20 14:35 +0200)
committerLaurent Lalanne <f5soh@free.fr>
Mon, 20 Apr 2015 12:35:08 +0000 (20 14:35 +0200)
tree80d3a3f6951f002b63d4a5eef87bf1ec933531d2
parentf68e1144caa92cac748bd0c7d8e272018fdc94f1
parent0b38791b3f1010013735b4df2de910d0eac72da1
Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next
ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml