Public Git Hosting - betaflight.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 076557b 6c231e1)

commit	5a1301f73d25cd35da7ec3e2eaa6e67af1446e7c
author	borisbstyle <dreambb1982@gmail.com>
	Fri, 11 Sep 2015 09:19:25 +0000 (11 11:19 +0200)
committer	borisbstyle <dreambb1982@gmail.com>
	Fri, 11 Sep 2015 09:19:25 +0000 (11 11:19 +0200)
tree	5c3ae2b4901268599dc3ba885c3c18083d991e27	tree \| snapshot (tar.gz zip)
parent	076557bbe569892ac8d0b71c76b544e0feda5d5c	commit \| diff
parent	6c231e189b5f02a30167dcef97eed0a3d441b69c	commit \| diff

Merge branch 'master' into betaflight

Conflicts:
Makefile
src/main/io/serial_cli.c
src/main/main.c
src/main/sensors/initialisation.c
src/main/sensors/initialisation.h

Makefile	diff1 \|	diff2 \|	blob \| history
docs/Cli.md	diff1 \|	diff2 \|	blob \| history
src/main/config/config.c	diff1 \|	diff2 \|	blob \| history
src/main/drivers/pwm_mapping.c	diff1 \|	diff2 \|	blob \| history
src/main/io/serial_cli.c	diff1 \|	diff2 \|	blob \| history
src/main/rx/rx.c	diff1 \|	diff2 \|	blob \| history
src/main/sensors/barometer.h	diff1 \|	diff2 \|	blob \| history
src/main/target/CHEBUZZF3/target.h	diff1 \|	diff2 \|	blob \| history
src/main/target/STM32F3DISCOVERY/target.h	diff1 \|	diff2 \|	blob \| history