Merge branch 'next' into kilrah/FAS_Offset_compensation

Conflicts:
	companion/src/modeledit/telemetry.cpp
This commit is contained in:
Bertrand Songis
2014-01-23 16:31:09 +01:00
1155 changed files with 5305 additions and 2209 deletions
+1 -1
View File
@@ -3746,7 +3746,7 @@ enum LimitsItems {
#undef MIN_MAX_ATTR
#define MIN_MAX_ATTR attr
#else
#define MIN_MAX_DISPLAY(x) (x)
#define MIN_MAX_DISPLAY(x) ((int8_t)(x))
#endif
#if defined(PCBTARANIS)