1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00

Merge branch 'rc-calibration' of

https://github.com/digitalentity/cleanflight into
digitalentity-rc-calibration

Conflicts:
	docs/Rx.md
	src/main/io/serial_cli.c
	src/main/rx/rx.c
	src/main/rx/rx.h
This commit is contained in:
Dominic Clifton 2015-08-04 00:06:12 +01:00
commit 27f8223de7
10 changed files with 300 additions and 5 deletions

View file

@ -1388,4 +1388,4 @@ void initBlackbox(void)
}
}
#endif
#endif