Merge branch 'virtualcurrent' of https://github.com/tracernz/cleanflight into tracern...
commit9ffe8779d7a4e0a41343aa84e38b6f947f122722
authorDominic Clifton <me@dominicclifton.name>
Mon, 26 Jan 2015 14:21:42 +0000 (26 15:21 +0100)
committerDominic Clifton <me@dominicclifton.name>
Mon, 26 Jan 2015 14:21:42 +0000 (26 15:21 +0100)
tree96de5bed2492bf839c4239ea19a2ed16a8cf259c
parent5d1fdaed6ebbdfe76943feb197284222206bb173
parent496d706097e693fedc331890eb74cde1921505ff
Merge branch 'virtualcurrent' of https://github.com/tracernz/cleanflight into tracernz-virtualcurrent
src/main/io/serial_cli.c
src/main/sensors/battery.h