Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-05 20:33:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

MAME 0.226

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAl+XcYQACgkQwXSxAYxA
 cQ55pBAAvVsf1FPlyW1mZC0I5ApFMTIyRGg6lXQvQiFQ5krvwnNC7D3do6UpprDB
 q2d1KlOjeJJi+CRnsTv4vBDPJzgcS/6glMZWpK28qiYoZCKCCTIWCxY/+4FQHLqE
 ySXaCNohNi5Zlht93Q5hJwzp5lOQynVlHFyA9ai8m44QqFQWNLaGnSCMxD8EZycc
 vVfvPR6Sl/eI17SLXEYIfImufkTaoqcrnq9ZNT7img7GBrNCKzbGf1B1B/MMia/l
 VuED6PspdezFrbSsNfepOfA7RErWpHJ+dNMY7XE3HkzqAhCQjL1vzbYwO7SYPeDT
 mzIOJHz95AFr0svnqXc12pnbBmm2hC6evQlurTL1G7WYp9CQk/qq9fFPAgOLCXel
 AaWKNnv+6PjQr9Yp5HwapBuyKfO/HASyo4akhkulaJPR4cGDcAgwbxMfGch5/jC+
 X/RW5I1gNmiLN7XFYh+UyBicgh7egHTHTUOSfMixm7n8K43RwdQ9DiPvPKpS5Cka
 pe6vqSAmWmFa8aV46Crbjdiwp7dZuu8C21/uBoB2m4mHxie7fnEANuWA5OYKProY
 8HK5HzS0lRKa4aPHUoch+tjcEL8lHXBvTWDHorPEoR3Mvhyby/7aR0jJeAaJEcNm
 BiB7rSTq5AUjjsMfjDvGpPPg57X3o9l7HJaXBA5nEF2guZen8+Y=
 =odxg
 -----END PGP SIGNATURE-----

Merge tag 'mame0226' into mainline-master

MAME 0.226
This commit is contained in:
Vas Crabb 2020-10-28 10:31:55 +11:00
commit 2f7ce2761e
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="225"
android:versionName="0.225"
android:versionCode="226"
android:versionName="0.226"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->

4
makefile
View File

@ -1719,14 +1719,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.225"' > $@
@echo '#define BARE_BUILD_VERSION "0.226"' > $@
@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.225" > $@
@echo #define BARE_BUILD_VERSION "0.226" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@