From 21e8716d4e91be0ccc207520b661b291c986527c Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Mon, 16 Mar 2015 16:08:44 +0100
Subject: [PATCH] [release] v5.4.2 stable version

---
 CHANGELOG.md      | 15 +++++++++++++++
 paparazzi_version |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89a4031c89a..7bdcd005a71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,22 @@
+Paparazzi 5.4.2_stable
+======================
+
+Maintenance release
+
 - GCS: fix undo for list of values
   [#1054] (https://github.com/paparazzi/paparazzi/issues/1054)
 - lisa_mx: fix secondary spektrum satellite UART AF
 - logalizer: fix csv export after allowing description tag in messages
+- nps: update nps_fdm_jsbsim to be compatible with latest jsbsim
+  [#1118] (https://github.com/paparazzi/paparazzi/pull/1118)
+- rotorcraft: fix attitude flight plan primitive
+  [#1103] (https://github.com/paparazzi/paparazzi/pull/1103)
+- flight plans: fix 'call' statement without loop
+- generators: only include raw makefile part from modules if target matches
+- GCS: GPS accuracy speech less verbose
+  [#1046] (https://github.com/paparazzi/paparazzi/issues/1046)
+- GCS: call index of first/single link "single"
+  [#1098] (https://github.com/paparazzi/paparazzi/issues/1098)
 
 Paparazzi 5.4.1_stable
 ======================
diff --git a/paparazzi_version b/paparazzi_version
index ae1cb15e532..05b05d2c962 100755
--- a/paparazzi_version
+++ b/paparazzi_version
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v5.4.0_stable
+DEF_VER=v5.4.2_stable
 
 # First try git describe (if running on a git repo),
 # then use default version from above (for release tarballs).