From 9e40708f7c1425c077e71232c0eacbd78edc247a Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Thu, 26 Jun 2014 22:59:10 +0200
Subject: [PATCH] 2.0.5 preparation

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

diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt
index ff122b736..b34727700 100644
--- a/companion/releasenotes.txt
+++ b/companion/releasenotes.txt
@@ -1,3 +1,11 @@
+<h2>Version 2.0.5</h2>
+<ul>
+<li>Fix crash on startup</li>
+<li>Fix version number in simu</li>
+<li>9XR-Pro now supported on Mac</li>
+<li>Fix loss of settings in telemetry custom screens</li>
+</ul>
+
 <h2>Version 2.0.4</h2>
 <ul>
 <li>Sound should be ok on all platforms</li>
diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 673482165..e582a2479 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 "0" )
-SET( C9X_VERSION_REVISION "4" )
+SET( C9X_VERSION_REVISION "5" )
 SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION} )
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt
index b26825d3f..09dd78a2e 100644
--- a/radio/releasenotes.txt
+++ b/radio/releasenotes.txt
@@ -1,3 +1,13 @@
+<h2>Version 2.0.5 / 2014-06-26</h2>
+[Taranis]
+<ul>
+<li>Add Flight Mode indication to the mixer/inputs screens
+<li>Joystick emulation fixed
+<li>Fixed float number display in Lua
+<li>Fixed telemetry screens page order (Lua, custom, voltage, GPS)
+<li>Fixed unability to disable switch warning for SG
+</ul>
+
 <h2>Version 2.0.4 / 2014-06-24</h2>
 [Taranis]
 <ul>
diff --git a/radio/src/Makefile b/radio/src/Makefile
index a5a438b9f..baa6a48bd 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -285,7 +285,7 @@ SHELL = sh
 IMG2LBM = -python ../util/img2lbm.py
 BIN2LBM = -python ../util/bin2lbm.py
 TRANSLATE = -python ../util/translate.py
-VERSION = 2.0.4
+VERSION = 2.0.5
 
 SRC =
 CPPSRC =