From 4be1194d487aa1eead4ab6f819d661b155420e09 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Mon, 9 May 2022 14:03:12 -0400
Subject: [PATCH] Squash release notes and update VERSION to v1.4.0-beta-1

---
 Htmldocs/release_notes.html | 26 +++-----------------------
 oscar/VERSION               |  2 +-
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index ae7009f9..c366eed3 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -11,7 +11,7 @@
     <b>This page in other languages:</b>
     <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
     <p>
-    <b>Changes and fixes in OSCAR v1.3.5-alpha.X</b>
+    <b>Changes and fixes in OSCAR v1.4.0-beta-1</b>
     <br>Portions of OSCAR are © 2019-2022 by
     <i>The OSCAR Team</i></p>
     <ul>
@@ -19,6 +19,8 @@
         <ul>
           <li>DreamStation 2 CPAP (410X150C)</li>
           <li>DreamStation 2 Auto CPAP Advanced (520X130C)</li>
+          <li>DreamStation 2 Auto CPAP Advanced (520X110C, 520X150C)</li>
+          <li>DreamStation 2 Auto CPAP Advanced with P-Flex (521X120C)</li>
           <li>BiPAP Auto (System One 60 Series) (761P)</li>
           <li>BiPAP autoSV Advanced 30 (System One 60 Series) (961TCA)</li>
           <li>REMstar Auto (System One) (552P)</li>
@@ -26,30 +28,8 @@
       </li>
       <li>[fix] Added support for pressure pulse, CA, and VS on BiPAP autoSV Advanced 30 (System One 60 Series) (960T).</li>
       <li>[fix] Fixed pressure settings scale on BiPAP autoSV Advanced 30 (System One 60 Series) (960T).</li>
-    </ul>
-    <p>
-    <b>Changes and fixes in OSCAR v1.3.5-alpha.2</b>
-    <br>Portions of OSCAR are © 2019-2022 by
-    <i>The OSCAR Team</i></p>
-    <ul>
-      <li>[new] Additional Philips Respironics devices tested and fully supported:
-        <ul>
-          <li>DreamStation 2 Auto CPAP Advanced with P-Flex (521X120C)</li>
-        </ul>
-      </li>
       <li>[fix] File Export Sessions now exports statistics session data properly.</li>
       <li>[fix] Fixed a rare crash on import when encountering corrupted Philips Respironics directories.</li>
-    </ul>
-    <p>
-    <b>Changes and fixes in OSCAR v1.3.5-alpha.0</b>
-    <br>Portions of OSCAR are © 2019-2022 by
-    <i>The OSCAR Team</i></p>
-    <ul>
-      <li>[new] Additional Philips Respironics devices tested and fully supported:
-        <ul>
-          <li>DreamStation 2 Auto CPAP Advanced (520X110C, 520X150C)</li>
-        </ul>
-      </li>
       <li>[new] Test Mantis integration.</li>
     </ul>
     <p>
diff --git a/oscar/VERSION b/oscar/VERSION
index b1ea432a..c08f6042 100644
--- a/oscar/VERSION
+++ b/oscar/VERSION
@@ -1,4 +1,4 @@
 // Update the string below to set OSCAR's version and release status.
 // See https://semver.org/spec/v2.0.0.html for details on format.
 
-#define VERSION "1.3.5-alpha.3"
+#define VERSION "1.4.0-beta-1"