Move to 2.1.5 (we are skipping 2.1.4 to differentiate from the FrSky's 2.1.4)

This commit is contained in:
Damjan Adamic
2015-10-24 18:59:45 +02:00
parent 022bd2d3da
commit 54891af0d2
4 changed files with 8 additions and 4 deletions
+3 -1
View File
@@ -1,4 +1,6 @@
<h2>Version 2.1.4 / <set date></h2>
<h2>Version 2.1.5 / <set date></h2>
Notice: version 2.1.4 was sipped by the OpenTX team to avoid confusion with the FrSky's official release of OpenTX 2.1.4
<ul>
<li>Fixed: changing any setting on the telemetry panel does not set the file as being modified (<a href=https://github.com/opentx/opentx/issues/2875>#2875</a>)</li>
+1 -1
View File
@@ -2,7 +2,7 @@ PROJECT( companion )
SET(C9X_VERSION_MAJOR "2")
SET(C9X_VERSION_MINOR "1")
SET(C9X_VERSION_REVISION "4")
SET(C9X_VERSION_REVISION "5")
SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
+3 -1
View File
@@ -1,4 +1,6 @@
<h2>Version 2.1.4 / <set date></h2>
<h2>Version 2.1.5 / <set date></h2>
Notice: version 2.1.4 was sipped by the OpenTX team to avoid confusion with the FrSky's official release of OpenTX 2.1.4
[Taranis]
<ul>
+1 -1
View File
@@ -395,7 +395,7 @@ IMG2LBM = -$(PYTHON) ../util/img2lbm.py
BIN2LBM = -$(PYTHON) ../util/bin2lbm.py
FONT2PNG = -$(PYTHON) ../util/font2png.py
TRANSLATE = -$(PYTHON) ../util/translate.py
VERSION = 2.1.4$(OPENTX_VERSION_SUFFIX)
VERSION = 2.1.5$(OPENTX_VERSION_SUFFIX)
THIRDPARTY = thirdparty
COOSDIR = $(THIRDPARTY)/CoOS