merge conflict resolved from 4.0.0

This commit is contained in:
2018-09-28 16:28:21 +02:00
86 changed files with 1112 additions and 2326 deletions

View File

@ -1,5 +1,6 @@
/** API versions */
#define APIRECEIVER 0x180718
#define APIRECEIVER 0x180927
#define APIEIGER 0x180820
#define APIJUNGFRAU 0x180820
#define APIGOTTHARD 0x180820
#define APIJUNGFRAU 0x180925
#define APIGOTTHARD 0x180928