tipouic
|
89bea4c38b
|
Merge remote-tracking branch 'refs/remotes/pascallanger/master'
# Conflicts:
# Multiprotocol/CX10_nrf24l01.ino
# Multiprotocol/CYRF6936_SPI.ino
# Multiprotocol/DSM2_cyrf6936.ino
# Multiprotocol/Devo_cyrf6936.ino
# Multiprotocol/FY326_nrf24l01.ino
# Multiprotocol/FlySky_a7105.ino
# Multiprotocol/FrSkyX_cc2500.ino
# Multiprotocol/FrSky_cc2500.ino
# Multiprotocol/KN_nrf24l01.ino
# Multiprotocol/MJXQ_nrf24l01.ino
# Multiprotocol/MT99xx_nrf24l01.ino
# Multiprotocol/Multiprotocol.ino
# Multiprotocol/NRF24l01_SPI.ino
# Multiprotocol/SHENQI_nrf24l01.ino
# Multiprotocol/Telemetry.ino
# Multiprotocol/YD717_nrf24l01.ino
# Multiprotocol/_Config.h
# Multiprotocol/iface_nrf24l01.h
# Multiprotocol/multiprotocol.h
# README.md
|
2016-09-30 13:16:12 +02:00 |
|