Merge branch 'surface-tracking-mod'
commite7c058beb36f42e95e1681c73b982f6fb2a8a2d4
authorKonstantin Sharlaimov (DigitalEntity) <konstantin.sharlaimov@gmail.com>
Fri, 8 Apr 2016 07:02:31 +0000 (8 17:02 +1000)
committerKonstantin Sharlaimov (DigitalEntity) <konstantin.sharlaimov@gmail.com>
Fri, 8 Apr 2016 07:02:31 +0000 (8 17:02 +1000)
tree47a224f7ab3cf91037d06b0085dc76f9b2066522
parentf3a949578bae55bb9d8588e19c955b73cdb2f625
parentf9a6d4394cae4d5fed4691e9068679ba3b885d9c
Merge branch 'surface-tracking-mod'
src/main/blackbox/blackbox.c
src/main/flight/navigation_rewrite.c
src/main/flight/navigation_rewrite_fixedwing.c
src/main/flight/navigation_rewrite_multicopter.c
src/main/flight/navigation_rewrite_pos_estimator.c
src/main/flight/navigation_rewrite_private.h
src/main/io/rc_controls.h
src/main/io/serial_msp.c
src/main/target/NAZE/target.h