Public Git Hosting - betaflight.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 9ca4569 75293f4)

commit	9d00fb6af4c5225dc7ec09455bbc62d9c78f63d9
author	Dominic Clifton <me@dominicclifton.name>
	Wed, 9 Sep 2015 19:33:02 +0000 (9 20:33 +0100)
committer	Dominic Clifton <me@dominicclifton.name>
	Wed, 9 Sep 2015 19:33:02 +0000 (9 20:33 +0100)
tree	4dbac737846dbabe101c267ece79f7314462a1df	tree \| snapshot (tar.gz zip)
parent	9ca456933ea0ffbd141a6f91c976d4d55137cd00	commit \| diff
parent	75293f42316e102150184aa3de4f19b6cf10370c	commit \| diff

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

src/main/drivers/barometer_bmp085.c	diff1 \|	diff2 \|	blob \| history
src/main/drivers/barometer_bmp085.h	diff1 \|	diff2 \|	blob \| history