?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 650389a 24b1e9f)
Merge branch 'LSM303DLHC_compass_new' of https://github.com/MJ666/cleanflight into...
commit1a2ee0e5b93d9b1e564a229d15b2cbbf59872ebd
authorDominic Clifton <me@dominicclifton.name>
Tue, 20 Jan 2015 22:54:35 +0000 (20 23:54 +0100)
committerDominic Clifton <me@dominicclifton.name>
Tue, 20 Jan 2015 22:54:35 +0000 (20 23:54 +0100)
treeab2785f26dd543e05c35f396fdfc6242a68ff175tree | snapshot (tar.gz zip)
parent650389afb67098a65a0c58559c7fd3e0f25a8d10commit | diff
parent24b1e9f49ee133cb914bfc8922eed69c833263a6commit | diff
Merge branch 'LSM303DLHC_compass_new' of https://github.com/MJ666/cleanflight into MJ666-LSM303DLHC_compass_new

Conflicts:
src/main/target/STM32F3DISCOVERY/target.h
src/main/target/STM32F3DISCOVERY/target.h diff1 |  diff2 |  blob | history