mirror of
https://github.com/holub/mame
synced 2025-06-28 15:14:21 +03:00
MAME 0.249
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmNZsQUACgkQwXSxAYxA cQ5rwBAAjgZp7ORufJUgEvQiDfocosa28zlw0CSb8onDFLs1bcUuKIIvTlwoOM3V fbAkbW6HdbB71PtOUGocmuabxb9cRBbOGZAQ3XJuF70BDOyazbx7lyfDUj39n5tP mOfLGQY5rabtN8Ubqv3mzwQaNJ+5SVtVSWmKkZqg393MQoreFJArXfblZv8+qYb/ ar10VTZW984LzsbVh4mGcq4HmU/3V48zaTgI8Ng9mkXHAZY4O4quFXwPaNhX7rfM YaJT+ZM4A8Hx3pIYi3Ue/axlFR8MlKakI37uq7HlFMCXw/LGPWvbs6spmoVmceUz vy2x4ULaO4fUNcXBDZVoaFbEBsGUAfRr26a4Z6ZFl6Zy1aDIA4Y1cEG3HN9Yib4k 9BH//qXs8ngMjtcKPK8VWh9JE8VbYZM2KxSxgSKuD86T2w+CgJGiOvGJTG6qZ/ec aE9hpAaWwi93+b1o8zy3C2FDWdk18XxMct2zsA1MdnEkOJRqL4eHXU86ht+RIBGT kDdhJfKHtHjLzdwgY7dFTAHAHYuCMCdwHXc4TV+8Hxcii4GWl1oG7vyxOUuER2qh fLVRzkfF657L7PEJ3IU5S6uvbclIKKWn+Py2G81EbEvRWVQcuUCgF8tS3+GeGTHT KT+DZKccSX+qZ3Xz9yNo+j+t+2rXMvy933Da3KxOrRy7Fj+9Lis= =Q5M8 -----END PGP SIGNATURE----- Merge tag 'mame0249' into mainline-master MAME 0.249
This commit is contained in:
commit
1aa8e4bb97
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="248"
|
||||
android:versionName="0.248"
|
||||
android:versionCode="249"
|
||||
android:versionName="0.249"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -120,9 +120,6 @@ such as:
|
||||
| Input: Remapped joystick #2: XInput Player 2 (device id: XInput Player 2)
|
||||
|
|
||||
|
||||
Note that the devices numbers in the verbose log output are zero-based, while
|
||||
the device numbers shown in MAME’s user interface and set in configuration files
|
||||
|
||||
|
||||
Limitations
|
||||
-----------
|
||||
|
@ -63,9 +63,9 @@ copyright = u'1997-2022, MAMEdev and contributors'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.248'
|
||||
version = '0.249'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.248'
|
||||
release = '0.249'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
4
makefile
4
makefile
@ -1579,7 +1579,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.248"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.249"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
@ -1589,7 +1589,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
|
||||
else
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo #define BARE_BUILD_VERSION "0.248" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.249" > $@
|
||||
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
|
||||
@echo extern const char bare_build_version[]; >> $@
|
||||
@echo extern const char bare_vcs_revision[]; >> $@
|
||||
|
Loading…
Reference in New Issue
Block a user