Merge pull request #2709 from betaflight/master
commit7c9301ab1c3944febafd7f3283454adf8306869f
authorDominic Clifton <me@dominicclifton.name>
Sun, 9 Apr 2017 12:40:50 +0000 (9 13:40 +0100)
committerGitHub <noreply@github.com>
Sun, 9 Apr 2017 12:40:50 +0000 (9 13:40 +0100)
tree577fb9f38c07bcef9b380e93cfbc5d9b8fccbd93
parente35c49761575d86f0f6a751652df68f0afba338d
parent53edcba0d83d58d1cc164654ec44f3f8ee6f8dfe
Merge pull request #2709 from betaflight/master

merge recent BF changes
src/main/fc/cli.c
src/main/fc/fc_core.c
src/main/io/osd.c