Merge branch 'development' of https://github.com/borisbstyle/betaflight into fix_naze...
commitb441465776e5365eaa1a895784200057be0779f8
authormikeller <github@ike.ch>
Sun, 19 Jun 2016 10:35:09 +0000 (19 22:35 +1200)
committermikeller <github@ike.ch>
Sun, 19 Jun 2016 10:35:09 +0000 (19 22:35 +1200)
tree9f5a1ee75b908cdbb6dcee4a716783e00a8832d1
parent4e01859a75d2cb7e50293186af492b8840f80173
parent70df33e2ded2f1cbf2a85ddf49f428020c4eed89
Merge branch 'development' of https://github.com/borisbstyle/betaflight into fix_naze_beeper
src/main/drivers/timer.h
src/main/main.c
src/main/target/NAZE/target.h