Some merge artifacts from @MJ666
commit19799ed66f18219dcd630c50a73a8eacca818111
authorborisbstyle <dreambb1982@gmail.com>
Tue, 5 Jul 2016 20:47:10 +0000 (5 22:47 +0200)
committerborisbstyle <dreambb1982@gmail.com>
Tue, 5 Jul 2016 20:47:10 +0000 (5 22:47 +0200)
tree8a59b4fbc04f59be94ea2d7a341a23d9e7b98b3e
parent1c67a9414bec52c1f04ca94457ab5dcc6b58c310
Some merge artifacts from @MJ666
src/main/target/ALIENFLIGHTF3/config.c
src/main/target/ALIENFLIGHTF4/config.c
src/main/target/COLIBRI_RACE/config.c
src/main/target/NAZE/config.c