| commit | 21b9fba3bf8889a8fb960ebbe058b6dccd6ce4bb | |
| author | mikeller <github@ike.ch> | |
| Mon, 25 Nov 2019 06:01:27 +0000 (25 19:01 +1300) | ||
| committer | mikeller <github@ike.ch> | |
| Mon, 25 Nov 2019 06:01:27 +0000 (25 19:01 +1300) | ||
| tree | 9b62bd72c61df9219e92e204ac61af1b018eacbf | treesnapshot (tar.gz zip) |
| parent | a65a4049adb03f5eec3d27de69b63c6ae6a120d6 | commitdiff |
Some fixes for what looks like merge problems introduced by #9012.
| src/main/io/displayport_hott.c | diffblobblamehistory | |
| src/main/io/displayport_msp.c | diffblobblamehistory | |
| src/main/osd/osd.h | diffblobblamehistory |