mirror of
https://github.com/holub/mame
synced 2025-06-06 04:43:45 +03:00
MAME 0.274
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmeaRtQACgkQwXSxAYxA cQ4AyA/9H0fZm6twDN3rz3MZWAeoYtMhdtUypQgUEV9W50SKBVDQAv5xO3WKxuFf oa13o3RWr5pYe6HaibITXszWgsxxHZT1nt0yKPhBzDdMhRHxdAZULvtMHcgr/b8B YJRnQYU5wbtSGWKqU6sRScjjWGrZw61zuBtda/K+MnRLYUv3Td+cKaQJ3wuzN19E ocSzohOzWvkN0eZ2BQFPMcYacrB5hy5/YhRZz9VJAtbmtvkJWL6+QbkADylsGSRP HUXibTL/6Gd+7XquGM8T2bjIU9X5xbWbi0pMGpDkGwHoSejzae5a3xMX4t+cNkMi ssbKmhdL99NOXJEx5DLCH9/3f/xWUdQatRcOIMtectZrof3feYEOgdFCWEobZTrR KDYPvNzrzdH1y7kqqDWHKnl1tG5f+KPs4C5IV7WZPZhCttLjuUbUcT+gFnAPdjL4 KF7mLd+Fx49wUYhuYtmPyu+dJqkL3CtKJVjnqOxarpaZh/iC3cVKA33+NU2X/yDV SxDWWaDb35370ovtHH6BvnGezVJpuw6jonuuqDBjJzKB//gpGmIGrqJIlnS/OssT gNU5BU3MrzBkLYOw02bFmt+immWA8S/NV1O3rn76ArT/XH0v7NlISk38UBOmA5cU Ut5R2sseuwPcxpknAO4pOjVFIrUlB3kJvdFPt+8XEFnpjgaFF84= =ztyp -----END PGP SIGNATURE----- Merge tag 'mame0274' into HEAD MAME 0.274
This commit is contained in:
commit
2eb734e545
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="273"
|
||||
android:versionName="0.273"
|
||||
android:versionCode="274"
|
||||
android:versionName="0.274"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -63,9 +63,9 @@ copyright = u'1997-2025, MAMEdev and contributors'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.273'
|
||||
version = '0.274'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.273'
|
||||
release = '0.274'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -5873,7 +5873,7 @@ Has optional unemulated [32X] mode, which in turn needs [disc swap]
|
||||
<rom name="Game no Kandume Vol.1 (Japan) (Track 30).bin" size="19121760" crc="aa75b323" />
|
||||
<rom name="Game no Kandume Vol.1 (Japan) (Track 31).bin" size="1300656" crc="0db9cca1" />
|
||||
-->
|
||||
<description>Game no Kandume Vol.1 (Japan)</description>
|
||||
<description>Game no Kanzume Vol.1 (Japan)</description>
|
||||
<year>1994</year>
|
||||
<publisher>Sega</publisher>
|
||||
<info name="serial" value="G-6032"/>
|
||||
@ -5916,7 +5916,7 @@ Has optional unemulated [32X] mode, which in turn needs [disc swap]
|
||||
<rom name="Game no Kandume Vol.2 (Japan) (Track 23).bin" size="19121760" crc="aa75b323" />
|
||||
<rom name="Game no Kandume Vol.2 (Japan) (Track 24).bin" size="1420608" crc="e76b47df" />
|
||||
-->
|
||||
<description>Game no Kandume Vol.2 (Japan)</description>
|
||||
<description>Game no Kanzume Vol.2 (Japan)</description>
|
||||
<year>1994</year>
|
||||
<publisher>Sega</publisher>
|
||||
<info name="serial" value="G-6033"/>
|
||||
|
4
makefile
4
makefile
@ -1572,7 +1572,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.273"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.274"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
@ -1582,7 +1582,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.273" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.274" > $@
|
||||
@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