| commit | ac7476474061255bccafcabb7b238b5d4da0d583 | |
| author | blckmn <blackman@xtra.com.au> | |
| Fri, 14 Oct 2016 23:52:27 +0000 (15 10:52 +1100) | ||
| committer | blckmn <blackman@xtra.com.au> | |
| Fri, 14 Oct 2016 23:52:27 +0000 (15 10:52 +1100) | ||
| tree | bdfe69e357bed7d88504fe853b48095f6c30646e | treesnapshot (tar.gz zip) |
| parent | 69719788cba61e50ba213285a34a4b975eb850d1 | commitdiff |
| parent | f68364fc33628c9ad6503bf603b95d53a7efe9eb | commitdiff |
Merge branch 'betaflight_master' into development
# Conflicts:
# src/main/common/filter.c
# src/main/common/filter.h
# src/main/flight/pid.c
# src/main/rx/ibus.c
# src/main/target/NAZE/config.c
# src/main/target/NAZE/target.h
# Conflicts:
# src/main/common/filter.c
# src/main/common/filter.h
# src/main/flight/pid.c
# src/main/rx/ibus.c
# src/main/target/NAZE/config.c
# src/main/target/NAZE/target.h
| src/main/rx/ibus.c | diff1 | diff2 | blobhistory |
| src/main/target/KISSFC/target.h | diff1 | diff2 | blobhistory |