Merge remote-tracking branch 'origin/master' into master-guidev

maron2000 · Jan 1, 2025 · a170c29 · a170c29
2 parents 991d71c + 895fca3
commit a170c29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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="2024-12-31"/>
+          <release version="@PACKAGE_VERSION@" date="2025-1-1"/>
   </releases>
   <screenshots>
 	  <screenshot type="default">

diff --git a/include/build_timestamp.h b/include/build_timestamp.h
@@ -1,4 +1,4 @@
 /*auto-generated*/
-#define UPDATED_STR "Dec 31, 2024 9:08:11pm"
-#define GIT_COMMIT_HASH "d4ba53e"
+#define UPDATED_STR "Jan 1, 2025 12:29:42am"
+#define GIT_COMMIT_HASH "a2a3a71"
 #define COPYRIGHT_END_YEAR "2025"