Public Git Hosting - betaflight.git/commit

commit	7d9fc2699a864fed09416298c581e6480bc7114b
author	Dominic Clifton <me@dominicclifton.name>
	Tue, 7 Apr 2015 19:33:03 +0000 (7 20:33 +0100)
committer	Dominic Clifton <me@dominicclifton.name>
	Tue, 7 Apr 2015 19:33:03 +0000 (7 20:33 +0100)
tree	5046a4eeb0aeba279e8fdcae4f702b89df795744	tree \| snapshot (tar.gz zip)
parent	7c375bd3938f6f85e235e8886753be0e07775c59	commit \| diff
parent	3a8725997b9a448e8dd8db03cc586856a63120f3	commit \| diff

Merge branch 'PA_update1' of git://github.com/Pierre-A/cleanflight into Pierre-A-PA_update1

Conflicts:
src/main/config/config.c
src/main/io/serial_cli.c
src/main/telemetry/hott.c
src/main/telemetry/telemetry.h

RSS Atom

src/main/config/config.c	diff1 \|	diff2 \|	blob \| history
src/main/io/serial_cli.c	diff1 \|	diff2 \|	blob \| history
src/main/telemetry/hott.c	diff1 \|	diff2 \|	blob \| history
src/main/telemetry/telemetry.h	diff1 \|	diff2 \|	blob \| history
src/test/unit/telemetry_hott_unittest.cc	diff1 \|	diff2 \|	blob \| history