From c020a9df307f6a5794336919fe5f2ac9a5a94e0a Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sat, 1 Sep 2018 01:23:06 +0200
Subject: [PATCH] Release Cubemap 1.4.0.

---
 NEWS      | 17 +++++++++++++++++
 version.h |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6d4da0a..13a6896 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Cubemap 1.4.0, 2018-09-01
+
+  * NOTE: Cubemap now requires a C++11 compiler. Also, live upgrades
+    from Cubemap before version 1.2.0 is no longer supported (upgrade
+    through 1.3.2 first if this is a problem for you).
+
+  * Support for TLS 1.2, through the tlse library (a lightly patched
+    version is included) and kTLS. This requires Linux >= 4.17.
+
+  * Support for fMP4 (HLS), including generating playlists on-the-fly.
+    This requires an input Metacube stream generated by Nageru >= 1.7.2.
+    See cubemap.config.sample for an example.
+
+  * Fix an issue that would cause problems with UDP inputs on reload
+    (unless their source encoding was explicitly marked as raw).
+
+
 Cubemap 1.3.2, 2017-05-24
 
   * Fix a bug where streams with paths exactly seven characters long
diff --git a/version.h b/version.h
index 2539b8e..8751f7a 100644
--- a/version.h
+++ b/version.h
@@ -3,7 +3,7 @@
 
 // Version number. Don't expect this to change all that often.
 
-#define SERVER_VERSION "1.4.0-pre"
+#define SERVER_VERSION "1.4.0"
 #define SERVER_IDENTIFICATION "Cubemap/" SERVER_VERSION
 
 #endif  // !defined(_VERSION_H)
-- 
2.39.2