Skip to content

Commit 50803b4

Browse files
committed
Merge tag 'mame0265' into rel265
MAME 0.265
2 parents e19f8ed + f8af5cc commit 50803b4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Diff for: android-project/app/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="org.mamedev.mame"
7-
android:versionCode="264"
8-
android:versionName="0.264"
7+
android:versionCode="265"
8+
android:versionName="0.265"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

Diff for: hash/apple2_flop_clcracked.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44665,7 +44665,7 @@ license:CC0-1.0
4466544665
</software>
4466644666

4466744667
<software name="chempertab">
44668-
<description>>Chemistry: The Periodic Table (A-251 version 1.1) (4am crack)</description>
44668+
<description>Chemistry: The Periodic Table (A-251 version 1.1) (4am crack)</description>
4466944669
<year>1988</year>
4467044670
<publisher>MECC</publisher>
4467144671
<info name="partno" value="A-251" />

Diff for: makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ endif
15781578

15791579
ifeq (posix,$(SHELLTYPE))
15801580
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1581-
@echo '#define BARE_BUILD_VERSION "0.264"' > $@
1581+
@echo '#define BARE_BUILD_VERSION "0.265"' > $@
15821582
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
15831583
@echo 'extern const char bare_build_version[];' >> $@
15841584
@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
15881588
@echo 'const char build_version[] = BARE_BUILD_VERSION "W (" BARE_VCS_REVISION ")";' >> $@
15891589
else
15901590
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1591-
@echo #define BARE_BUILD_VERSION "0.264" > $@
1591+
@echo #define BARE_BUILD_VERSION "0.265" > $@
15921592
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
15931593
@echo extern const char bare_build_version[]; >> $@
15941594
@echo extern const char bare_vcs_revision[]; >> $@

0 commit comments

Comments
 (0)