Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
joncampbell123 committed Feb 1, 2021
2 parents f520d9f + 0e2b726 commit 8c91d7d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<category>Emulation</category>
</categories>
<releases>
<release version="@PACKAGE_VERSION@" date="2021-1-30"/>
<release version="@PACKAGE_VERSION@" date="2021-1-31"/>
</releases>
<screenshots>
<screenshot type="default">
Expand Down
4 changes: 2 additions & 2 deletions include/build_timestamp.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Jan 30, 2021 9:13:43pm"
#define GIT_COMMIT_HASH "c952f5a"
#define UPDATED_STR "Jan 31, 2021 8:57:04pm"
#define GIT_COMMIT_HASH "d38ac84"
#define COPYRIGHT_END_YEAR "2021"

0 comments on commit 8c91d7d

Please sign in to comment.