Public Git Hosting - betaflight.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c62a49e d4167a0)

commit	b8cf11487867ede0b0056bdc5d2e2e06aa079561
author	Dominic Clifton <dominic.clifton@cleanflight.com>
	Tue, 11 Apr 2017 18:53:17 +0000 (11 19:53 +0100)
committer	Dominic Clifton <dominic.clifton@cleanflight.com>
	Tue, 11 Apr 2017 18:53:17 +0000 (11 19:53 +0100)
tree	4d86e6ac4956c11d40f6910457387a51d057e454	tree \| snapshot (tar.gz zip)
parent	c62a49e7656bfd297b9bd0a133caeb6cc4666dd1	commit \| diff
parent	d4167a03dfc8e45c423765d70adf3bc01dbec3ad	commit \| diff

Merge branch 'master' of ../betaflight into betaflight-master

17 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
src/main/blackbox/blackbox.c	diff1 \|	diff2 \|	blob \| history
src/main/cms/cms_menu_misc.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/cli.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/config.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/fc_core.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/fc_msp.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/fc_rc.c	diff1 \|	diff2 \|	blob \| history
src/main/fc/fc_tasks.c	diff1 \|	diff2 \|	blob \| history
src/main/flight/pid.c	diff1 \|	diff2 \|	blob \| history
src/main/flight/pid.h	diff1 \|	diff2 \|	blob \| history
src/main/io/osd.c	diff1 \|	diff2 \|	blob \| history
src/main/platform.h	diff1 \|	diff2 \|	blob \| history
src/main/target/COLIBRI_RACE/i2c_bst.c	diff1 \|	diff2 \|	blob \| history
src/main/telemetry/mavlink.c	diff1 \|	diff2 \|	blob \| history
src/main/telemetry/smartport.c	diff1 \|	diff2 \|	blob \| history
src/test/Makefile	diff1 \|	diff2 \|	blob \| history