From 2e472700cc9d25b211a0849934572ce375681506 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 24 Jun 2014 11:29:27 +0200
Subject: [PATCH] 2.0.4 preparation

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

diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt
index 5cd1ed5d5..ff122b736 100644
--- a/companion/releasenotes.txt
+++ b/companion/releasenotes.txt
@@ -1,3 +1,10 @@
+<h2>Version 2.0.4</h2>
+<ul>
+<li>Sound should be ok on all platforms</li>
+<li>Min/Max reviewed in Logical switches (for the whole telemetry)</li>
+<li>Various bug fixes</li> 
+</ul>
+
 <h2>Version 2.0.3</h2>
 <ul>
 <li>EEPROM import bug on AdjustGVAR function</li>
diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 4e661dbf6..673482165 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 "3" )
+SET( C9X_VERSION_REVISION "4" )
 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 c591e42cc..b26825d3f 100644
--- a/radio/releasenotes.txt
+++ b/radio/releasenotes.txt
@@ -1,3 +1,19 @@
+<h2>Version 2.0.4 / 2014-06-24</h2>
+[Taranis]
+<ul>
+<li>Lua Telemetry custom screens added 
+<li>Lua wrong memory used indication
+<li>Telemetry on the serial port in the battery bay
+<li>
+</ul>
+
+[All]
+<ul>
+<li>Air Speed added in Logs
+<li>|d|>x bug fix
+<li>Timers played even if 00:00
+</ul>
+
 <h2>Version 2.0.3 / 2014-06-17</h2>
 <ul>
 <li>Bugfix on Reset Flight function (possible freeze of the menus)
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 8881a37a5..4c2f28212 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.3
+VERSION = 2.0.4
 
 SRC =
 CPPSRC =