diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 05ce70d156694..765e2a0788be6 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/conf.py b/docs/source/conf.py index 0b78ef7a53e70..c498499145f18 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = '0.266' +version = '0.267' # The full version, including alpha/beta/rc tags. -release = '0.266' +release = '0.267' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/hash/challenge_gear_cart.xml b/hash/challenge_gear_cart.xml index 0bc6ecec1a47a..164920cd3c847 100644 --- a/hash/challenge_gear_cart.xml +++ b/hash/challenge_gear_cart.xml @@ -54,10 +54,10 @@ Extra: Nihon kaitaku no tabi Game (日本かいたくの旅ゲーム） - 6th Grade: Dance Battle + Challenge 6-nensei 2003 Benesse Corporation - + diff --git a/hash/sgi_mips.xml b/hash/sgi_mips.xml index 15ccbd7307b69..78787dac49f9f 100644 --- a/hash/sgi_mips.xml +++ b/hash/sgi_mips.xml @@ -5826,7 +5826,7 @@ license:CC0-1.0 - + NetBSD 1.6.2 2004 The NetBSD Project @@ -5846,7 +5846,7 @@ license:CC0-1.0 - + NetBSD 2.0 2004 The NetBSD Project @@ -5866,7 +5866,7 @@ license:CC0-1.0 - + NetBSD 2.0.2 2005 The NetBSD Project @@ -5886,7 +5886,7 @@ license:CC0-1.0 - + NetBSD 2.1 2005 The NetBSD Project @@ -5906,7 +5906,7 @@ license:CC0-1.0 - + NetBSD 3.0 2005 The NetBSD Project @@ -5926,7 +5926,7 @@ license:CC0-1.0 - + NetBSD 3.0.1 2006 The NetBSD Project @@ -5946,7 +5946,7 @@ license:CC0-1.0 - + NetBSD 3.0.2 2006 The NetBSD Project @@ -5966,7 +5966,7 @@ license:CC0-1.0 - + NetBSD 3.1 2006 The NetBSD Project @@ -5986,7 +5986,7 @@ license:CC0-1.0 - + NetBSD 4.0 2007 The NetBSD Project @@ -6006,7 +6006,7 @@ license:CC0-1.0 - + NetBSD 4.0.1 2008 The NetBSD Project @@ -6026,7 +6026,7 @@ license:CC0-1.0 - + NetBSD 5.0 2009 The NetBSD Project @@ -6046,7 +6046,7 @@ license:CC0-1.0 - + NetBSD 5.0.1 2009 The NetBSD Project @@ -6066,7 +6066,7 @@ license:CC0-1.0 - + NetBSD 5.0.2 2010 The NetBSD Project @@ -6086,7 +6086,7 @@ license:CC0-1.0 - + NetBSD 5.1 2010 The NetBSD Project @@ -6106,7 +6106,7 @@ license:CC0-1.0 - + NetBSD 5.1.1 2012 The NetBSD Project @@ -6126,7 +6126,7 @@ license:CC0-1.0 - + NetBSD 5.1.2 2012 The NetBSD Project @@ -6146,7 +6146,7 @@ license:CC0-1.0 - + NetBSD 5.1.3 2013 The NetBSD Project @@ -6166,7 +6166,7 @@ license:CC0-1.0 - + NetBSD 5.1.4 2014 The NetBSD Project @@ -6186,7 +6186,7 @@ license:CC0-1.0 - + NetBSD 5.1.5 2014 The NetBSD Project @@ -6206,7 +6206,7 @@ license:CC0-1.0 - + NetBSD 5.2 2012 The NetBSD Project @@ -6226,7 +6226,7 @@ license:CC0-1.0 - + NetBSD 5.2.1 2013 The NetBSD Project @@ -6246,7 +6246,7 @@ license:CC0-1.0 - + NetBSD 5.2.2 2014 The NetBSD Project @@ -6266,7 +6266,7 @@ license:CC0-1.0 - + NetBSD 5.2.3 2014 The NetBSD Project @@ -6286,7 +6286,7 @@ license:CC0-1.0 - + NetBSD 6.0 2012 The NetBSD Project @@ -6306,7 +6306,7 @@ license:CC0-1.0 - + NetBSD 6.0.1 2012 The NetBSD Project @@ -6326,7 +6326,7 @@ license:CC0-1.0 - + NetBSD 6.0.2 2013 The NetBSD Project @@ -6346,7 +6346,7 @@ license:CC0-1.0 - + NetBSD 6.0.3 2013 The NetBSD Project diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 5ddeddd6aa6d4..183a753d02fb5 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -54223,7 +54223,7 @@ Side B: Once Upon a Lily Pad - Bruxólico (demo 1.0, English) + Bruxólico (English, demo 1.0) 2022 Amaweks @@ -54235,7 +54235,7 @@ Side B: Once Upon a Lily Pad - Bruxólico (demo 1.0, Portuguese) + Bruxólico (Portuguese, demo 1.0) 2022 Amaweks diff --git a/makefile b/makefile index e15b8e42fe92c..599df7935dad7 100644 --- a/makefile +++ b/makefile @@ -1578,7 +1578,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.266"' > $@ + @echo '#define BARE_BUILD_VERSION "0.267"' > $@ @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.266" > $@ + @echo #define BARE_BUILD_VERSION "0.267" > $@ @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/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py index 1158528d9547a..28afa75d1f2fe 100644 --- a/scripts/minimaws/lib/wsgiserve.py +++ b/scripts/minimaws/lib/wsgiserve.py @@ -6,7 +6,6 @@ from . import dbaccess from . import htmltmpl -import cgi import inspect import json import mimetypes @@ -16,11 +15,12 @@ import urllib import wsgiref.util -if hasattr(cgi, 'escape'): - htmlescape = cgi.escape -else: +try: import html htmlescape = html.escape +except ImportError: + import cgi + htmlescape = cgi.escape try: import urllib.parse as urlparse diff --git a/src/devices/cpu/dsp56156/inst.cpp b/src/devices/cpu/dsp56156/inst.cpp index 339156aa35e84..c091659ba6785 100644 --- a/src/devices/cpu/dsp56156/inst.cpp +++ b/src/devices/cpu/dsp56156/inst.cpp @@ -2,10 +2,9 @@ // copyright-holders:Andrew Gardner #include "emu.h" #include "inst.h" -#include "emu.h" -namespace DSP_56156 -{ +namespace DSP_56156 { + // Factory std::unique_ptr Instruction::decodeInstruction(const Opcode* opc, const uint16_t word0, @@ -783,4 +782,4 @@ std::unique_ptr Instruction::decodeInstruction(const Opcode* opc, return nullptr; } -} +} // namespace DSP_56156 diff --git a/src/devices/cpu/m6805/m68hc05e1.cpp b/src/devices/cpu/m6805/m68hc05e1.cpp index 75105f54bf0cf..b4a220c0d0823 100644 --- a/src/devices/cpu/m6805/m68hc05e1.cpp +++ b/src/devices/cpu/m6805/m68hc05e1.cpp @@ -6,6 +6,7 @@ #include "emu.h" #include "m68hc05e1.h" +#include "m6805defs.h" #include "6805dasm.h" #define VERBOSE (0) diff --git a/src/mame/bandai/wswan.cpp b/src/mame/bandai/wswan.cpp index 4fb5fe4ae2ac0..d892621267c25 100644 --- a/src/mame/bandai/wswan.cpp +++ b/src/mame/bandai/wswan.cpp @@ -321,7 +321,7 @@ void wswan_state::pockchv2(machine_config &config) wswan_base(config); // software lists - SOFTWARE_LIST(config, "pc2_list").set_compatible("pockchalv2"); + SOFTWARE_LIST(config, "pc2_list").set_original("pockchalv2"); } void wscolor_state::wscolor(machine_config &config) diff --git a/src/mame/tomy/tomy_princ.cpp b/src/mame/tomy/tomy_princ.cpp index c151c0af26b64..4a753a3be36c0 100644 --- a/src/mame/tomy/tomy_princ.cpp +++ b/src/mame/tomy/tomy_princ.cpp @@ -1508,6 +1508,7 @@ ROM_START( princnt ) ROM_REGION( 0x100000, "maincpu", 0 ) ROM_LOAD("tc538000.u3", 0x00000, 0x100000, CRC(e4e2bfe9) SHA1(b3a7727544918b9030c362694ddf9a2fc3bca8b4)) ROM_END + ROM_START( princnt3 ) ROM_REGION( 0x100000, "maincpu", 0 ) ROM_LOAD("tc538000.3.u3", 0x00000, 0x100000, CRC(eed0a0f9) SHA1(c15b97c2c29b354136cef046f72a6443b415e673))