Merge branch 'develop'

joncampbell123 · Apr 1, 2021 · 1917732 · 1917732
2 parents 95a5378 + 9d09811
commit 1917732
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
@@ -10,7 +10,7 @@
     <category>Emulation</category>
   </categories>
   <releases>
-          <release version="@PACKAGE_VERSION@" date="2021-3-30"/>
+          <release version="@PACKAGE_VERSION@" date="2021-3-31"/>
   </releases>
   <screenshots>
 	  <screenshot type="default">

diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf
@@ -14,7 +14,7 @@
 #    windowposition: Set the window position at startup in the positionX,positionY format (e.g.: 1300,200)
 #           display: Specify a screen/display number to use for a multi-screen setup (0 = default).
 #            output: What video system to use for output (openglnb = OpenGL nearest; openglpp = OpenGL perfect; ttf = TrueType font output).
-#                      Possible values: default, surface, overlay, opengl, openglnb, openglhq, openglpp, ddraw, ttf.
+#                      Possible values: default, surface, overlay, ttf, opengl, openglnb, openglhq, openglpp, ddraw.
 #          autolock: Mouse will automatically lock, if you click on the screen. (Press CTRL-F10 to unlock)
 #DOSBOX-X-ADV:# autolock_feedback: Autolock status feedback type, i.e. visual, auditive, none.
 #DOSBOX-X-ADV:#                      Possible values: none, beep, flash.

diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf
@@ -14,7 +14,7 @@
 #    windowposition: Set the window position at startup in the positionX,positionY format (e.g.: 1300,200)
 #           display: Specify a screen/display number to use for a multi-screen setup (0 = default).
 #            output: What video system to use for output (openglnb = OpenGL nearest; openglpp = OpenGL perfect; ttf = TrueType font output).
-#                      Possible values: default, surface, overlay, opengl, openglnb, openglhq, openglpp, ddraw, ttf.
+#                      Possible values: default, surface, overlay, ttf, opengl, openglnb, openglhq, openglpp, ddraw.
 #          autolock: Mouse will automatically lock, if you click on the screen. (Press CTRL-F10 to unlock)
 # clip_mouse_button: Select the mouse button or use arrow keys for the shared clipboard copy/paste function.
 #                      The default mouse button is "right", which means using the right mouse button to select text, copy to and paste from the host clipboard.

diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf
@@ -14,7 +14,7 @@
 #    windowposition: Set the window position at startup in the positionX,positionY format (e.g.: 1300,200)
 #           display: Specify a screen/display number to use for a multi-screen setup (0 = default).
 #            output: What video system to use for output (openglnb = OpenGL nearest; openglpp = OpenGL perfect; ttf = TrueType font output).
-#                      Possible values: default, surface, overlay, opengl, openglnb, openglhq, openglpp, ddraw, ttf.
+#                      Possible values: default, surface, overlay, ttf, opengl, openglnb, openglhq, openglpp, ddraw.
 #          autolock: Mouse will automatically lock, if you click on the screen. (Press CTRL-F10 to unlock)
 # autolock_feedback: Autolock status feedback type, i.e. visual, auditive, none.
 #                      Possible values: none, beep, flash.

diff --git a/include/build_timestamp.h b/include/build_timestamp.h
@@ -1,4 +1,4 @@
 /*auto-generated*/
-#define UPDATED_STR "Mar 30, 2021 6:36:30pm"
-#define GIT_COMMIT_HASH "0cece70"
+#define UPDATED_STR "Mar 31, 2021 10:24:06pm"
+#define GIT_COMMIT_HASH "05c561d"
 #define COPYRIGHT_END_YEAR "2021"