| commit | 3993bda6b809365c6ec1b31a8782ef81a1485113 | |
| author | borisbstyle <dreambb1982@gmail.com> | |
| Fri, 18 Sep 2015 22:16:17 +0000 (19 00:16 +0200) | ||
| committer | borisbstyle <dreambb1982@gmail.com> | |
| Fri, 18 Sep 2015 22:16:17 +0000 (19 00:16 +0200) | ||
| tree | aed16762a4e3bce503482eb22ddd5491b630ee1e | treesnapshot (tar.gz zip) |
| parent | d564b2f3a6d4d0dd0852dacee182b7bfc95b7283 | commitdiff |
| parent | bb504d97377bb2b7141f6b1a2972d3f9141dc807 | commitdiff |
Merge branch 'betaflight' of https://github.com/henn1001/cleanflight into henn1001-betaflight
Conflicts:
obj/betaflight_CC3D.bin
src/main/drivers/accgyro_spi_mpu6000.c
Conflicts:
obj/betaflight_CC3D.bin
src/main/drivers/accgyro_spi_mpu6000.c
| src/main/drivers/accgyro_spi_mpu6000.c | diff1 | diff2 | blobhistory |