From 54891af0d26997bdbe61601d1124b3615e49627f Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sat, 24 Oct 2015 18:59:45 +0200
Subject: [PATCH] Move to 2.1.5 (we are skipping 2.1.4 to differentiate from
 the FrSky's 2.1.4)

---
 companion/releasenotes.txt   | 4 +++-
 companion/src/CMakeLists.txt | 2 +-
 radio/releasenotes.txt       | 4 +++-
 radio/src/Makefile           | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt
index 4e8071e95..717059a03 100644
--- a/companion/releasenotes.txt
+++ b/companion/releasenotes.txt
@@ -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>
diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 3df4ec991..d1176bf8e 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -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})
diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt
index bfd270c0c..c0de73d22 100644
--- a/radio/releasenotes.txt
+++ b/radio/releasenotes.txt
@@ -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>
diff --git a/radio/src/Makefile b/radio/src/Makefile
index ef81c7a86..fe66b48f4 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -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