diff options
| author | 2021-10-27 01:45:16 +1100 | |
|---|---|---|
| committer | 2021-10-27 01:45:16 +1100 | |
| commit | b0cec43b7ec8b2a2e76bbf1c3a138e00e7195b5f (patch) | |
| tree | aee89b26cc70bcaedde3d944710bbd28ad0c6bd6 | |
| parent | 66f9dadf96f2ba704ad647c59573192c22ceb144 (diff) | |
| parent | 34d8357465cadf0ec30dc069f8b60d7b24bbf7a4 (diff) | |
Merge tag 'mame0237' into mainline-master
MAME 0.237
| -rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | hash/nes.xml | 2 | ||||
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | plugins/hiscore/init.lua | 2 | ||||
| -rw-r--r-- | plugins/hiscore/plugin.json | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 6dea6f7f6b3..13b404156cc 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mamedev.mame" - android:versionCode="236" - android:versionName="0.236" + android:versionCode="237" + android:versionName="0.237" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/hash/nes.xml b/hash/nes.xml index 0c8d0d7f7e5..7528ae5c8f9 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -62976,6 +62976,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx <year>1999</year> <publisher>EduBank</publisher> <info name="alt_title" value="영재컴 꼬꼬마 Pack 1"/> + <info name="alt_title" value="Brilliant Com Cocoma Pack 1"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="cocoma" /> <dataarea name="prg" size="524288"> @@ -62992,6 +62993,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx <year>1999</year> <publisher>EduBank</publisher> <info name="alt_title" value="영재컴 꼬꼬마 Pack 2"/> + <info name="alt_title" value="Brilliant Com Cocoma Pack 2"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="cocoma" /> <dataarea name="prg" size="524288"> @@ -1546,7 +1546,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.236"' > $@ + @echo '#define BARE_BUILD_VERSION "0.237"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1556,7 +1556,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.236" > $@ + @echo #define BARE_BUILD_VERSION "0.237" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index 4ec94c9a590..b4677c957dd 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -7,7 +7,7 @@ -- local exports = { name = 'hiscore', - version = '1.0.0', + version = '1.0.1', description = 'Hiscore', license = 'CC0', author = { name = 'borgar@borgar.net' } } diff --git a/plugins/hiscore/plugin.json b/plugins/hiscore/plugin.json index 62e02e431d6..a77184d3016 100644 --- a/plugins/hiscore/plugin.json +++ b/plugins/hiscore/plugin.json @@ -2,7 +2,7 @@ "plugin": { "name": "hiscore", "description": "Hiscore support", - "version": "1.0.0", + "version": "1.0.1", "author": "borgar@borgar.net", "type": "plugin", "start": "false" |
