| commit | c944083f7354011c0e355a355c26cbae3a2a33ce | |
| author | borisbstyle <dreambb1982@gmail.com> | |
| Mon, 28 Sep 2015 23:03:25 +0000 (29 01:03 +0200) | ||
| committer | borisbstyle <dreambb1982@gmail.com> | |
| Mon, 28 Sep 2015 23:03:25 +0000 (29 01:03 +0200) | ||
| tree | 81a7774bb6209c60d50645c4b475f07dd951bcea | treesnapshot (tar.gz zip) |
| parent | 5c0bcd4d28f29b48744212661775ef25dbcfd594 | commitdiff |
| parent | 2c701bd58f363889ce6045f2b8a968bc90f49c5b | commitdiff |
Merge branch 'master' into betaflight
Conflicts:
src/main/config/config.c
src/main/flight/imu.c
Conflicts:
src/main/config/config.c
src/main/flight/imu.c
| src/main/config/config.c | diff1 | diff2 | blobhistory |
| src/main/io/serial_msp.c | diff1 | diff2 | blobhistory |
| src/main/mw.c | diff1 | diff2 | blobhistory |
| src/main/rx/rx.c | diff1 | diff2 | blobhistory |