From c0accf2c8e857587c2c9ff0e3f3294e63de5f692 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Mon, 30 May 2022 16:58:47 -0400
Subject: [PATCH] Final updates to v1.4.0-rc-1

---
 Htmldocs/credits.html       |  6 +++---
 Htmldocs/release_notes.html | 12 +-----------
 oscar/VERSION               |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Htmldocs/credits.html b/Htmldocs/credits.html
index dfd3482e..f808b2df 100644
--- a/Htmldocs/credits.html
+++ b/Htmldocs/credits.html
@@ -30,7 +30,7 @@
     <p>
     <b>Developers</b>
     <br>
-    Phil Olynyk (pholynyk) (<i>Lead Developer</i>), GuyScharf, sawinglogz, Ray Elliott, untoutseul05</p>
+    Phil Olynyk (pholynyk) (<i>Lead Developer</i>), GuyScharf, sawinglogz, Ray Elliott (LoudSnorer), untoutseul05</p>
     <p>
     <b>Reporters</b>
     <br>AlanE, BrandonA, Crimson Nape, foxfire, Heyns, jeremieb, jaswilliams, palerider, patl</p>
@@ -41,11 +41,11 @@
     unidee</p>
     <p>
     <b>Advisors</b>
-    <br>aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rtannerf</p>
+    <br>aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rhashimoto, rtannerf</p>
     <p>
     <b>Translators</b>
     <br>
-    Arie Klerk (A KLERK) (<i>Translations Team Coordinator, Dutch</i>), 1st.qwerty (<i>Polish</i>), C Chan (<i>Trad.Chinese)</i>, Caniss (<i>Swedish</i>), delta (<i>Romanian</i>), dolceitalia (<i>Italian</i>),  drmaestro (<i>Turkish</i>), drol (<i>French</i>), FaureCourtet (<i>French</i>), GregK (<i>Russian, Hebrew</i>), hearsay73 (<i>Filipino</i>), Heyns (<i>Afrikaans</i>), Hypoxic (<i>Greek</i>), jaswilliams (<i>British</i>), johanh (<i>Finnish</i>), k2boys (<i>Korean</i>), Lazer1234 (<i>Swedish</i>), Mac_Sheepcounter (<i>German</i>), mazingas65 (<i>Italian</i>), Ppja (<i>Spanish</i>), pstrjds (<i>Bulgarian</i>), refurbished (<i>Polish</i>), Ristraus (<i>Brazilian Portugese</i>), rlabs (<i>Russian</i>), ShaunBlake (<i>British</i>), steffenreitz (<i>German</i>), tolnaiz (<i>Hungarian</i>), unidee (<i>Finnish</i>), untoutseul05 (<i>French</i>), yrnkrn (<i>Hebrew</i>), N-A-N (<i>Thai</i>). <br>
+    Arie Klerk (A KLERK) (<i>Translations Team Coordinator, Dutch</i>), 1st.qwerty (<i>Polish</i>), C Chan (<i>Trad.Chinese)</i>, delta (<i>Romanian</i>), dolceitalia (<i>Italian</i>),  drmaestro (<i>Turkish</i>), drol (<i>French</i>), FaureCourtet (<i>French</i>), GregK (<i>Russian, Hebrew</i>), hearsay73 (<i>Filipino</i>), Heyns (<i>Afrikaans</i>), Hypoxic (<i>Greek</i>), k2boys (<i>Korean</i>), Lazer1234 (<i>Swedish</i>), mazingas65 (<i>Italian</i>), Ppja (<i>Spanish</i>), pstrjds (<i>Bulgarian</i>), refurbished (<i>Polish</i>), Ristraus (<i>Portugese and Brazilian Portugese</i>), rlabs (<i>Russian</i>), ShaunBlake (<i>British</i>), steffenreitz (<i>German</i>), tolnaiz (<i>Hungarian</i>), unidee (<i>Finnish</i>), untoutseul05 (<i>French</i>), yrnkrn (<i>Hebrew</i>), N-A-N (<i>Thai</i>). <br>
     <b>Thank you all very much for your continuous effort!</b></p>
     <p>
       <b>OSCAR is always looking for help: programmers, testers, or translators. If you are interested, please PM &#39;Gideon&#39; on the Apnea Board Forum.</b>
diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index bdb26588..1b9dd451 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -11,23 +11,13 @@
     <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.4.0-beta-2</b>
+    <b>Changes and fixes in OSCAR v1.4.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 Advanced CPAP (420X150C)</li>
-        </ul>
-      </li>
-    </ul>
-    <p>
-    <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>
-      <li>[new] Additional Philips Respironics devices tested and fully supported:
-        <ul>
           <li>DreamStation 2 CPAP (410X150C)</li>
           <li>DreamStation 2 Auto CPAP Advanced (520X110C, 520X130C, 520X150C)</li>
           <li>DreamStation 2 Auto CPAP Advanced with P-Flex (521X120C, 521X140C)</li>
diff --git a/oscar/VERSION b/oscar/VERSION
index c08f6042..2810c1ab 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.4.0-beta-1"
+#define VERSION "1.4.0-rc-1"