Merge branch 'beta_backup' into betaflight
commit36a77c39d47bb3b087610b46e581b266aa5dd532
authorborisbstyle <dreambb1982@gmail.com>
Mon, 22 Feb 2016 12:10:39 +0000 (22 13:10 +0100)
committerborisbstyle <dreambb1982@gmail.com>
Mon, 22 Feb 2016 12:10:39 +0000 (22 13:10 +0100)
tree80e85f45ffeba04de2d1ac44e1ce2ffdb5fde3a1
parente3dce9f705301ed0eecc4042ae2890803123c588
parentf2075888a32eb47965dfeec0f4729371d06e7b02
Merge branch 'beta_backup' into betaflight
src/main/config/config.c
src/main/io/serial_cli.c