| commit | 3e72bb5e3b23641f5fdbf4832f384359ce9d5f01 | |
| author | blckmn <blackman@xtra.com.au> | |
| Tue, 21 Jun 2016 20:30:38 +0000 (22 06:30 +1000) | ||
| committer | blckmn <blackman@xtra.com.au> | |
| Tue, 21 Jun 2016 20:30:38 +0000 (22 06:30 +1000) | ||
| tree | d9170553860e86892708fbd1fbc621897e48726c | treesnapshot (tar.gz zip) |
| parent | c889f00d261b74321b23b33fee2afe791dcaf14e | commitdiff |
| parent | 6f28ba0f56be30735778b97a6b109b478fb2d2ba | commitdiff |
Merge branch 'betaflight' into ready_to_merge
# Conflicts:
# src/main/version.h
# Conflicts:
# src/main/version.h
| src/main/io/serial_msp.c | diff1 | diff2 | blobhistory |
| src/main/io/serial_msp.h | diff1 | diff2 | blobhistory |