1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
betaflight/src
Dominic Clifton 9d00fb6af4 Merge branch 'acro-external-I2C-baro' of
https://github.com/SteveAmor/cleanflight into
SteveAmor-acro-external-I2C-baro

Conflicts:
	src/main/drivers/barometer_bmp085.c
	src/main/drivers/barometer_bmp085.h
2015-09-09 20:33:02 +01:00
..
main Merge branch 'acro-external-I2C-baro' of 2015-09-09 20:33:02 +01:00
test Updates and feature additions to failsafe system. 2015-09-04 16:55:40 +02:00