Public Git Hosting - betaflight.git/commit

commit	dae052632cc773fde6497f37d333e7bc01f6e610
author	borisbstyle <dreambb1982@gmail.com>
	Tue, 15 Sep 2015 21:36:40 +0000 (15 23:36 +0200)
committer	borisbstyle <dreambb1982@gmail.com>
	Tue, 15 Sep 2015 21:36:40 +0000 (15 23:36 +0200)
tree	7d6796193bc7288f8f4f2b90d56f3f97f9178d43	tree \| snapshot (tar.gz zip)
parent	f38c2f2f998e6380dd96ff41911d152ac4f0525f	commit \| diff
parent	c6f5b98a7916a369bcf9445d04feef4036dc3ce5	commit \| diff

Merge branch 'master' into betaflight

Conflicts:
src/main/drivers/accgyro_mpu3050.c
src/main/drivers/accgyro_mpu6050.c
src/main/drivers/accgyro_spi_mpu6000.c
src/main/drivers/accgyro_spi_mpu6500.c
src/main/drivers/sensor.h

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
src/main/config/config.c	diff1 \|	diff2 \|	blob \| history
src/main/drivers/accgyro_mpu3050.c	diff1 \|	diff2 \|	blob \| history
src/main/drivers/accgyro_mpu6050.c	diff1 \|	diff2 \|	blob \| history
src/main/drivers/accgyro_spi_mpu6000.c	diff1 \|	diff2 \|	blob \| history
src/main/drivers/accgyro_spi_mpu6500.c	diff1 \|	diff2 \|	blob \| history
src/main/drivers/sensor.h	diff1 \|	diff2 \|	blob \| history
src/main/drivers/system.c	diff1 \|	diff2 \|	blob \| history
src/main/main.c	diff1 \|	diff2 \|	blob \| history
src/main/sensors/initialisation.c	diff1 \|	diff2 \|	blob \| history