Fixing merge and build broken by
commitf7b3914a91f8fc58f15f989fec1cd30f8999a737
authorDominic Clifton <me@dominicclifton.name>
Wed, 9 Sep 2015 23:21:43 +0000 (10 00:21 +0100)
committerDominic Clifton <me@dominicclifton.name>
Wed, 9 Sep 2015 23:22:08 +0000 (10 00:22 +0100)
treed89394aecccd9fc71d9aad9e2bafab51dff222cf
parent0d0311607c844e0a785704e2b2dc5427c1c90117
Fixing merge and build broken by
3cf77579ba0cc728a32bdf3b1446d76c2656ec92
src/main/drivers/barometer_bmp085.c