mirror of
https://github.com/holub/mame
synced 2025-04-16 05:24:54 +03:00
MAME 0.272
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmdJ5qUACgkQwXSxAYxA cQ6ykA//cT7xJlw136NNsc6QoWfZdpfYvt32rJMG+bKNipjakl5rGlSWwsDdHu8J OhMHiOQF20EhPHEPZxVQfyU9rJbp2SPS+1k1aP3wHpE1PnxZmq+wM4sofVs/E/wN vcWuWVfumWE52A5Oyder/P69vSsz5GpI7XIa8qECzXZJOmDLuxwPaPbzfCIT0qum f5rYRZinRHy2ny1fDIUepU97kaFSkCMMnyJMU9o3LlwUV/XeY84yksMxY7Qs8jqP Y9cmggi/ujkYSsdKKr8a+7BHyF3ndGuWBk+ObeoWJNYV5I+q5LG0rgjhmMxox86x krwi2ed0ss1X8x0ooDMNxoYRfPfr+IpQKqxy5lhS2kOpkFkdGD41Q7hwPE/9/mH4 7gaDhzqIGNF4OO8V2+Dp5bxa+BdV00O1/FViWrEUW2O0w6d5e/kOqO5qgD7OyS4L AqoE4uT9vdu16RlCriyhZRLcAdVFlGLhTQCaEGgu0PIZ2SNwnh/vONe3JWjh+4G5 DdSzdfONcU+/AoUlslJn4CTD2Kh7iidlKpk4JRJ6VUb7iBALy3nVCrLrX4sBNrVn wrx5py/u1r7pRHuftk8+QcF3wVIdTWJ8N+33A0HX1sjLuuVTNnhb09ZTXc4edLrU CwVFYjeV8v0dmZq+be2dAbmxNNAIwEMkCYvo5TqpPoztKtwSCjM= =2phB -----END PGP SIGNATURE----- Merge tag 'mame0272' into HEAD MAME 0.272
This commit is contained in:
commit
9d6cffc9c6
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="271"
|
||||
android:versionName="0.271"
|
||||
android:versionCode="272"
|
||||
android:versionName="0.272"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -63,9 +63,9 @@ copyright = u'1997-2024, MAMEdev and contributors'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.271'
|
||||
version = '0.272'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.271'
|
||||
release = '0.272'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -4163,8 +4163,8 @@ license:CC0-1.0
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="danchits">
|
||||
<description>Danchi Tsuma no Yuuwaku (Japan)</description>
|
||||
<software name="danchizm">
|
||||
<description>Danchizuma no Yuuwaku (Japan)</description>
|
||||
<year>1985</year>
|
||||
<publisher>KOEI</publisher>
|
||||
<info name="alt_title" value="団地妻の誘惑"/>
|
||||
|
@ -8230,8 +8230,8 @@ ExtractDisk [02]"DAIVA_B " -> "daiva_02.d88"
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="danchits">
|
||||
<description>Danchi Tsuma no Yuuwaku</description>
|
||||
<software name="danchizm">
|
||||
<description>Danchizuma no Yuuwaku</description>
|
||||
<year>1983</year>
|
||||
<publisher>光栄 (Koei)</publisher>
|
||||
<!-- PC8801 -->
|
||||
@ -8244,8 +8244,8 @@ ExtractDisk [02]"DAIVA_B " -> "daiva_02.d88"
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="danchitsa" cloneof="danchits">
|
||||
<description>Danchi Tsuma no Yuuwaku (alt)</description>
|
||||
<software name="danchizma" cloneof="danchizm">
|
||||
<description>Danchizuma no Yuuwaku (alt)</description>
|
||||
<year>1983</year>
|
||||
<publisher>光栄 (Koei)</publisher>
|
||||
<!-- PC8801 -->
|
||||
|
@ -224,8 +224,8 @@ Titles, publishers and release dates taken from:
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="danchits">
|
||||
<description>Danchi Tsuma no Yuuwaku</description>
|
||||
<software name="danchizm">
|
||||
<description>Danchizuma no Yuuwaku</description>
|
||||
<year>1983</year>
|
||||
<publisher>光栄 (Koei)</publisher>
|
||||
<info name="release" value="198306xx"/>
|
||||
|
4
makefile
4
makefile
@ -1578,7 +1578,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.271"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.272"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
@ -1588,7 +1588,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.271" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.272" > $@
|
||||
@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