Skip to content

Commit

Permalink
Merge tag 'mame0265' into rel265
Browse files Browse the repository at this point in the history
MAME 0.265
  • Loading branch information
mahlemiut committed Apr 24, 2024
2 parents e19f8ed + f8af5cc commit 50803b4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions android-project/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="264"
android:versionName="0.264"
android:versionCode="265"
android:versionName="0.265"
android:installLocation="auto">

<!-- OpenGL ES 2.0 -->
Expand Down
2 changes: 1 addition & 1 deletion hash/apple2_flop_clcracked.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44665,7 +44665,7 @@ license:CC0-1.0
</software>

<software name="chempertab">
<description>>Chemistry: The Periodic Table (A-251 version 1.1) (4am crack)</description>
<description>Chemistry: The Periodic Table (A-251 version 1.1) (4am crack)</description>
<year>1988</year>
<publisher>MECC</publisher>
<info name="partno" value="A-251" />
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,7 @@ endif

ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.264"' > $@
@echo '#define BARE_BUILD_VERSION "0.265"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@
Expand All @@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo 'const char build_version[] = BARE_BUILD_VERSION "W (" BARE_VCS_REVISION ")";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.264" > $@
@echo #define BARE_BUILD_VERSION "0.265" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@
Expand Down

0 comments on commit 50803b4

Please sign in to comment.