mirror of
https://github.com/mamedev/mame.git
synced 2024-11-16 07:48:32 +01:00
MAME 0.258
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmTs5/sACgkQwXSxAYxA cQ5kRBAAti2igBXV1hdZ/dMqy5Hc5chs+qrOWHDviFQYM/PbqBb/B0IqUln7NK3u JJx8fVsSfiVNolJ82zPA3FTLtdtmaUkI1WgTvvX1+UiLwKAJmH/1SoA6NA0JPIxX z/S+polq1E41rqJcvL1hJvywkzvIEhw/ASW82FhgBg8nP5F1yMOTIU1MA7xd6DIV UG0XJXdyEwdIiXY4jxMq0TOZsd/vPs9QIXRjkvJwWmgqfkZFvFIuS2ol51t8eOMd Br3xEcz9NI0LIWtxFW2d0e92keb2N7jgmuNfRiGofTqHK0Jucs9FNFfQOoc9PbzB wf8VNWRmxhHN0uGGJEo8O1SUD2GRFac8Or3zajUmkkglZePDrzMUPjBiyqZp4plf BN4E6RR5aKom3kYx7S8vQw8SeobmeXWQoKK1nCDSPDmlkYP8oNG/9aLPNn18AC8K I+kotv8fMLDOzkwTuEb3E+6OY5EEjx2cjYv3cQ7icBZ5iHKR79SFD/OWuX+/Jf1U mheiEIwlWFTqad6nP7Wii7SUtk5sxZaspq5OAc3J3QehrPPpi7QTQuO95M4+ccpy d20WoU2ticUsz1zDGvfSsPqA9TjrnKCsLjFjNryAeKOmRioBn56uRu3D0Y6180RW FSgf7KBvYIcHn9ntgeiTSLpNVDuobvHW8kdAiBfN6R5gBftn7wo= =o6Ah -----END PGP SIGNATURE----- Merge tag 'mame0258' into HEAD MAME 0.258
This commit is contained in:
commit
af29cf22f1
3 changed files with 6 additions and 6 deletions
|
@ -4,8 +4,8 @@
|
|||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="257"
|
||||
android:versionName="0.257"
|
||||
android:versionCode="258"
|
||||
android:versionName="0.258"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
|
|
@ -63,9 +63,9 @@ copyright = u'1997-2023, MAMEdev and contributors'
|
|||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.257'
|
||||
version = '0.258'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.257'
|
||||
release = '0.258'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
4
makefile
4
makefile
|
@ -1561,7 +1561,7 @@ endif
|
|||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.257"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.258"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
|
@ -1571,7 +1571,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.257" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.258" > $@
|
||||
@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 a new issue