diff options
author | 2021-07-28 12:59:58 +1000 | |
---|---|---|
committer | 2021-07-28 12:59:58 +1000 | |
commit | a3f413ac423f9bd0aca9de004cfd4633ad6aa294 (patch) | |
tree | 3663daaeaccd7a92ff4611e343b5a1b0c467a132 | |
parent | ffa992f596c86ece49b811b28cb72eb1af242134 (diff) | |
parent | 2633c19a68fbe5c3c47750b4ac83992545e7e733 (diff) |
Merge tag 'mame0234' into mainline-master
MAME 0.234
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | hash/c64_cass.xml | 2 | ||||
-rw-r--r-- | hash/ibm5170.xml | 2 | ||||
-rw-r--r-- | hash/neogeo.xml | 2 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/mame/drivers/at.cpp | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 5978b0b0cbb..1c86e915138 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="233" - android:versionName="0.233" + android:versionCode="234" + android:versionName="0.234" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/hash/c64_cass.xml b/hash/c64_cass.xml index d4fb6e7d8f3..52fb9a15250 100644 --- a/hash/c64_cass.xml +++ b/hash/c64_cass.xml @@ -623,7 +623,7 @@ Some are based on the C64 Tape Archive at https://archive.org/download/c64tapes/ </software> <software name="advbasil"> - <description>Adventures of Bond... Basildon Bond</description> + <description>Adventures of Bond... Basildon Bond</description> <year>1986</year> <publisher>Probe Software</publisher> diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml index cda044f8f3d..914f3fd78da 100644 --- a/hash/ibm5170.xml +++ b/hash/ibm5170.xml @@ -16491,7 +16491,7 @@ license:CC0 </software> <software name="robocop3"> - <description>Robocop 3"</description> + <description>Robocop 3</description> <year>1992</year> <publisher>Ocean</publisher> <info name="developer" value="Digital Image Design" /> diff --git a/hash/neogeo.xml b/hash/neogeo.xml index 2cc754afa12..a419a2f00ab 100644 --- a/hash/neogeo.xml +++ b/hash/neogeo.xml @@ -6926,7 +6926,7 @@ license:CC0 --> <software name="irrmaze"> - <description>The Irritating Maze/ Ultra Denryu Iraira Bou</description> + <description>The Irritating Maze / Ultra Denryu Iraira Bou</description> <year>1997</year> <publisher>SNK / Saurus</publisher> <info name="serial" value="??M-2360"/> @@ -1760,14 +1760,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.233"' > $@ + @echo '#define BARE_BUILD_VERSION "0.234"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.233" > $@ + @echo #define BARE_BUILD_VERSION "0.234" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index 469b27f8f38..69636906ed6 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -6075,7 +6075,7 @@ COMP( 198?, pccm216, ibm5170, 0, atturbo, 0, at_state, init_at COMP( 1986, pcd2, ibm5170, 0, ibm5170, 0, at_state, init_at, "Siemens", "PCD-2", MACHINE_NOT_WORKING ) COMP( 1991, pcd204, ibm5170, 0, atturbo, 0, at_state, init_at, "Philips", "PCD204 (PCD200 series)", MACHINE_NOT_WORKING ) COMP( 198?, pcd2m, ibm5170, 0, atturbo, 0, at_state, init_at, "Siemens", "PCD-2M", MACHINE_NOT_WORKING ) -COMP( 198?, peas286, ibm5170, 0, atturbo, 0, at_state, init_at, "Peacock computer", "S-286 Rev A", MACHINE_NOT_WORKING ) +COMP( 198?, peas286, ibm5170, 0, atturbo, 0, at_state, init_at, "Peacock Computer", "S-286 Rev A", MACHINE_NOT_WORKING ) COMP( 1990, profpc33, ibm5170, 0, atturbo, 0, at_state, init_at, "Profex", "PC 33", MACHINE_NOT_WORKING ) COMP( 198?, prolite286,ibm5170, 0, neat, 0, at_state, init_at, "CAF", "Prolite 286/16", MACHINE_NOT_WORKING ) COMP( 198?, pwb7270e, ibm5170, 0, neat, 0, at_state, init_at, "Advanced Logic Research", "PWB 7270 REV E", MACHINE_NOT_WORKING ) @@ -6113,7 +6113,7 @@ COMP( 199?, dfi386sx, ibm5170, 0, at386sx, 0, at_state, init_at COMP( 199?, dvbslan, ibm5170, 0, at386sx, 0, at_state, init_at, "Datavan", "Book-Size LAN station", MACHINE_NOT_WORKING ) COMP( 199?, ecs8517, ibm5170, 0, at386sx, 0, at_state, init_at, "Elitegroup", "ECS 8517 v3.3", MACHINE_NOT_WORKING ) COMP( 199?, elt386sx, ibm5170, 0, at386sx, 0, at_state, init_at, "Elitegroup", "ELT-386SX-160BE", MACHINE_NOT_WORKING ) -COMP( 198?, eltp9, ibm5170, 0, at386sx, 0, at_state, init_at, "Chaintech", "ELT-P9 / Most likely ELT-386SX-160D", MACHINE_NOT_WORKING ) +COMP( 198?, eltp9, ibm5170, 0, at386sx, 0, at_state, init_at, "Chaintech", "ELT-P9 / most likely ELT-386SX-160D", MACHINE_NOT_WORKING ) COMP( 198?, epsax3, ibm5170, 0, at386sx, 0, at_state, init_at, "Epson", "PC AX3", MACHINE_NOT_WORKING ) COMP( 19??, ht18c, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "unknown 386sx AT clones (HT18/C chipset)", MACHINE_NOT_WORKING ) COMP( 199?, ibm2121, ibm5170, 0, at386sx, 0, at_state, init_at, "International Business Machines", "PS/1 2121", MACHINE_NOT_WORKING ) @@ -6124,7 +6124,7 @@ COMP( 198?, ktx20t02, ibm5170, 0, at386sx, 0, at_state, init_at COMP( 199?, mbc18nb, ibm5170, 0, at386sx, 0, at_state, init_at, "Sanyo", "MBC-18NB", MACHINE_NOT_WORKING ) COMP( 1992, mbc28, ibm5170, 0, at386sx, 0, at_state, init_at, "Sanyo", "MBC-28", MACHINE_NOT_WORKING ) // Complains about missing mouse hardware COMP( 1993, megapc, 0, 0, megapc, 0, megapc_state, init_megapc, "Amstrad plc", "MegaPC", MACHINE_NOT_WORKING ) -COMP( 199?, mmbo4088, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "486MMBO4088 (TI TX486SLC/E", MACHINE_NOT_WORKING ) +COMP( 199?, mmbo4088, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "486MMBO4088 (TI TX486SLC/E)", MACHINE_NOT_WORKING ) COMP( 199?, mokp386sx, ibm5170, 0, at386sx, 0, at_state, init_at, "Morse", "KP 386SX V2.21", MACHINE_NOT_WORKING ) COMP( 199?, ocpanii, ibm5170, 0, at386sx, 0, at_state, init_at, "Octek", "Panther II", MACHINE_NOT_WORKING ) COMP( 199?, op82c283, ibm5170, 0, at386sx, 0, at_state, init_at, "<unknown>", "386sx motherboards using the OPTi 82C283 chipset", MACHINE_NOT_WORKING ) |