Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

MAME 0.236

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmFSgp4ACgkQwXSxAYxA
 cQ4azA//RuH1U7Ugl4/Jq821oOaQqwv4qcusKmrgLAxbWfGFTsbrbBJoaCMvGj0I
 MvTZ3dVuW/mO4Gl4axWQOuGpSKvhxIevnOswtj1rYdfwTxc4wLDczcFqVsxMAhts
 YOd+3MFFev+7grR7R4PVHJVqjvV5M5CMus4Gr2DQyC+4d7BcUe29ZOXYGbzE+kkf
 4tWzWpDeuAPQgOTuJGFoM7uNAyW/0UYQ+NDKiN8o2CllEetMocW3fp9CWv9GjhGm
 H32GKXFvfkolm5WFAZghvAtWTwq3hRTBWkKpy+8gAS8F2woQgILAySfn/PKAkE5m
 Qqk5rs3mOgd9FzQaKfymSyF9iNU350sW9an7H9UI6Fcnaxsmad4UE+qQXyLlG/JS
 FatYdCA/CkufBbAeet5uAkW2XbA0CJP+649h4v0oN13lDlc2oAeNZEl/pU8fSTlZ
 LByhggLSmDTM7q6KeZ707ABV4K8u4F6hjvhS1QD0a1h+CvLRD/wlIqV90XePlh3p
 Ul7XOqlBKFlPATFn79dXsil1K5iXk2KeNvj1YP8OMazI8gp8MhcuVksiJW1Fiiwq
 +k7rgQhUgMBin5yxwIt1OeRlXUZfNIUokmiiCWXYXbc7QAFCDZ7iCdPnaBfh55OW
 QRvl1z8LNLYqhWYvYmPdB5dPBAkrcpL4K06935ss4S6tptDwdJ8=
 =EnPR
 -----END PGP SIGNATURE-----

Merge tag 'mame0236' into mainline-master

MAME 0.236
This commit is contained in:
Vas Crabb 2021-09-29 12:54:32 +10:00
commit 4d06099090
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="235"
android:versionName="0.235"
android:versionCode="236"
android:versionName="0.236"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->

4
makefile
View File

@ -1756,14 +1756,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.235"' > $@
@echo '#define BARE_BUILD_VERSION "0.236"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.235" > $@
@echo #define BARE_BUILD_VERSION "0.236" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@