Skip to content

Commit 9abb39b

Browse files
cuavascuavas
committed
Merge tag 'mame0267' into HEAD
MAME 0.267
2 parents 9f6c0de + 663abae commit 9abb39b

File tree

11 files changed

+47
-46
lines changed

11 files changed

+47
-46
lines changed

‎android-project/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="org.mamedev.mame"
7-
android:versionCode="266"
8-
android:versionName="0.266"
7+
android:versionCode="267"
8+
android:versionName="0.267"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

‎docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = '0.266'
66+
version = '0.267'
6767
# The full version, including alpha/beta/rc tags.
68-
release = '0.266'
68+
release = '0.267'
6969

7070
# The language for content autogenerated by Sphinx. Refer to documentation
7171
# for a list of supported languages.

‎hash/challenge_gear_cart.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ Extra: Nihon kaitaku no tabi Game (日本かいたくの旅ゲーム）
5454
<softwarelist name="challenge_gear_cart" description="Benesse Challenge Gear cartridges">
5555

5656
<software name="6grade" supported="no">
57-
<description>6th Grade: Dance Battle</description>
57+
<description>Challenge 6-nensei</description>
5858
<year>2003</year>
5959
<publisher>Benesse Corporation</publisher>
60-
<info name="alt_title" value="ダンスバトル" />
60+
<info name="alt_title" value="チャレンジ6年生" />
6161
<part name="cart" interface="challenge_gear_cart">
6262
<dataarea name="rom" size="0x80000">
6363
<rom name="MS040601.ic1" size="0x80000" crc="487ecb9c" sha1="bc89468aff7f06f1694eed17f15cab46c0d1638e" />

‎hash/sgi_mips.xml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5826,7 +5826,7 @@ license:CC0-1.0
58265826

58275827
<!-- NetBSD -->
58285828

5829-
<software name="netbsd_1_6_2">
5829+
<software name="netbsd_1_6_2" supported="no">
58305830
<description>NetBSD 1.6.2</description>
58315831
<year>2004</year> <!-- 10/04 -->
58325832
<publisher>The NetBSD Project</publisher>
@@ -5846,7 +5846,7 @@ license:CC0-1.0
58465846
</part>
58475847
</software>
58485848

5849-
<software name="netbsd_2_0" cloneof="netbsd_2_0_2">
5849+
<software name="netbsd_2_0" cloneof="netbsd_2_0_2" supported="no">
58505850
<description>NetBSD 2.0</description>
58515851
<year>2004</year> <!-- 12/04 -->
58525852
<publisher>The NetBSD Project</publisher>
@@ -5866,7 +5866,7 @@ license:CC0-1.0
58665866
</part>
58675867
</software>
58685868

5869-
<software name="netbsd_2_0_2">
5869+
<software name="netbsd_2_0_2" supported="no">
58705870
<description>NetBSD 2.0.2</description>
58715871
<year>2005</year> <!-- 04/05 -->
58725872
<publisher>The NetBSD Project</publisher>
@@ -5886,7 +5886,7 @@ license:CC0-1.0
58865886
</part>
58875887
</software>
58885888

5889-
<software name="netbsd_2_1">
5889+
<software name="netbsd_2_1" supported="no">
58905890
<description>NetBSD 2.1</description>
58915891
<year>2005</year> <!-- 10/04 -->
58925892
<publisher>The NetBSD Project</publisher>
@@ -5906,7 +5906,7 @@ license:CC0-1.0
59065906
</part>
59075907
</software>
59085908

5909-
<software name="netbsd_3_0" cloneof="netbsd_3_0_2">
5909+
<software name="netbsd_3_0" cloneof="netbsd_3_0_2" supported="no">
59105910
<description>NetBSD 3.0</description>
59115911
<year>2005</year> <!-- 12/05 -->
59125912
<publisher>The NetBSD Project</publisher>
@@ -5926,7 +5926,7 @@ license:CC0-1.0
59265926
</part>
59275927
</software>
59285928

5929-
<software name="netbsd_3_0_1" cloneof="netbsd_3_0_2">
5929+
<software name="netbsd_3_0_1" cloneof="netbsd_3_0_2" supported="no">
59305930
<description>NetBSD 3.0.1</description>
59315931
<year>2006</year> <!-- 07/06 -->
59325932
<publisher>The NetBSD Project</publisher>
@@ -5946,7 +5946,7 @@ license:CC0-1.0
59465946
</part>
59475947
</software>
59485948

5949-
<software name="netbsd_3_0_2">
5949+
<software name="netbsd_3_0_2" supported="no">
59505950
<description>NetBSD 3.0.2</description>
59515951
<year>2006</year> <!-- 11/06 -->
59525952
<publisher>The NetBSD Project</publisher>
@@ -5966,7 +5966,7 @@ license:CC0-1.0
59665966
</part>
59675967
</software>
59685968

5969-
<software name="netbsd_3_1">
5969+
<software name="netbsd_3_1" supported="no">
59705970
<description>NetBSD 3.1</description>
59715971
<year>2006</year> <!-- 11/06 -->
59725972
<publisher>The NetBSD Project</publisher>
@@ -5986,7 +5986,7 @@ license:CC0-1.0
59865986
</part>
59875987
</software>
59885988

5989-
<software name="netbsd_4_0" cloneof="netbsd_4_0_1">
5989+
<software name="netbsd_4_0" cloneof="netbsd_4_0_1" supported="no">
59905990
<description>NetBSD 4.0</description>
59915991
<year>2007</year> <!-- 12/07 -->
59925992
<publisher>The NetBSD Project</publisher>
@@ -6006,7 +6006,7 @@ license:CC0-1.0
60066006
</part>
60076007
</software>
60086008

6009-
<software name="netbsd_4_0_1">
6009+
<software name="netbsd_4_0_1" supported="no">
60106010
<description>NetBSD 4.0.1</description>
60116011
<year>2008</year> <!-- 10/08 -->
60126012
<publisher>The NetBSD Project</publisher>
@@ -6026,7 +6026,7 @@ license:CC0-1.0
60266026
</part>
60276027
</software>
60286028

6029-
<software name="netbsd_5_0" cloneof="netbsd_5_0_2">
6029+
<software name="netbsd_5_0" cloneof="netbsd_5_0_2" supported="no">
60306030
<description>NetBSD 5.0</description>
60316031
<year>2009</year> <!-- 04/09 -->
60326032
<publisher>The NetBSD Project</publisher>
@@ -6046,7 +6046,7 @@ license:CC0-1.0
60466046
</part>
60476047
</software>
60486048

6049-
<software name="netbsd_5_0_1" cloneof="netbsd_5_0_2">
6049+
<software name="netbsd_5_0_1" cloneof="netbsd_5_0_2" supported="no">
60506050
<description>NetBSD 5.0.1</description>
60516051
<year>2009</year> <!-- 07/09 -->
60526052
<publisher>The NetBSD Project</publisher>
@@ -6066,7 +6066,7 @@ license:CC0-1.0
60666066
</part>
60676067
</software>
60686068

6069-
<software name="netbsd_5_0_2">
6069+
<software name="netbsd_5_0_2" supported="no">
60706070
<description>NetBSD 5.0.2</description>
60716071
<year>2010</year> <!-- 02/10 -->
60726072
<publisher>The NetBSD Project</publisher>
@@ -6086,7 +6086,7 @@ license:CC0-1.0
60866086
</part>
60876087
</software>
60886088

6089-
<software name="netbsd_5_1" cloneof="netbsd_5_1_5">
6089+
<software name="netbsd_5_1" cloneof="netbsd_5_1_5" supported="no">
60906090
<description>NetBSD 5.1</description>
60916091
<year>2010</year> <!-- 11/10 -->
60926092
<publisher>The NetBSD Project</publisher>
@@ -6106,7 +6106,7 @@ license:CC0-1.0
61066106
</part>
61076107
</software>
61086108

6109-
<software name="netbsd_5_1_1" cloneof="netbsd_5_1_5">
6109+
<software name="netbsd_5_1_1" cloneof="netbsd_5_1_5" supported="no">
61106110
<description>NetBSD 5.1.1</description>
61116111
<year>2012</year> <!-- 01/12 -->
61126112
<publisher>The NetBSD Project</publisher>
@@ -6126,7 +6126,7 @@ license:CC0-1.0
61266126
</part>
61276127
</software>
61286128

6129-
<software name="netbsd_5_1_2" cloneof="netbsd_5_1_5">
6129+
<software name="netbsd_5_1_2" cloneof="netbsd_5_1_5" supported="no">
61306130
<description>NetBSD 5.1.2</description>
61316131
<year>2012</year> <!-- 02/12 -->
61326132
<publisher>The NetBSD Project</publisher>
@@ -6146,7 +6146,7 @@ license:CC0-1.0
61466146
</part>
61476147
</software>
61486148

6149-
<software name="netbsd_5_1_3" cloneof="netbsd_5_1_5">
6149+
<software name="netbsd_5_1_3" cloneof="netbsd_5_1_5" supported="no">
61506150
<description>NetBSD 5.1.3</description>
61516151
<year>2013</year> <!-- 09/13 -->
61526152
<publisher>The NetBSD Project</publisher>
@@ -6166,7 +6166,7 @@ license:CC0-1.0
61666166
</part>
61676167
</software>
61686168

6169-
<software name="netbsd_5_1_4" cloneof="netbsd_5_1_5">
6169+
<software name="netbsd_5_1_4" cloneof="netbsd_5_1_5" supported="no">
61706170
<description>NetBSD 5.1.4</description>
61716171
<year>2014</year> <!-- 01/14 -->
61726172
<publisher>The NetBSD Project</publisher>
@@ -6186,7 +6186,7 @@ license:CC0-1.0
61866186
</part>
61876187
</software>
61886188

6189-
<software name="netbsd_5_1_5">
6189+
<software name="netbsd_5_1_5" supported="no">
61906190
<description>NetBSD 5.1.5</description>
61916191
<year>2014</year> <!-- 11/14 -->
61926192
<publisher>The NetBSD Project</publisher>
@@ -6206,7 +6206,7 @@ license:CC0-1.0
62066206
</part>
62076207
</software>
62086208

6209-
<software name="netbsd_5_2" cloneof="netbsd_5_2_3">
6209+
<software name="netbsd_5_2" cloneof="netbsd_5_2_3" supported="no">
62106210
<description>NetBSD 5.2</description>
62116211
<year>2012</year> <!-- 11/12 -->
62126212
<publisher>The NetBSD Project</publisher>
@@ -6226,7 +6226,7 @@ license:CC0-1.0
62266226
</part>
62276227
</software>
62286228

6229-
<software name="netbsd_5_2_1" cloneof="netbsd_5_2_3">
6229+
<software name="netbsd_5_2_1" cloneof="netbsd_5_2_3" supported="no">
62306230
<description>NetBSD 5.2.1</description>
62316231
<year>2013</year> <!-- 09/13 -->
62326232
<publisher>The NetBSD Project</publisher>
@@ -6246,7 +6246,7 @@ license:CC0-1.0
62466246
</part>
62476247
</software>
62486248

6249-
<software name="netbsd_5_2_2" cloneof="netbsd_5_2_3">
6249+
<software name="netbsd_5_2_2" cloneof="netbsd_5_2_3" supported="no">
62506250
<description>NetBSD 5.2.2</description>
62516251
<year>2014</year> <!-- 01/14 -->
62526252
<publisher>The NetBSD Project</publisher>
@@ -6266,7 +6266,7 @@ license:CC0-1.0
62666266
</part>
62676267
</software>
62686268

6269-
<software name="netbsd_5_2_3">
6269+
<software name="netbsd_5_2_3" supported="no">
62706270
<description>NetBSD 5.2.3</description>
62716271
<year>2014</year> <!-- 11/14 -->
62726272
<publisher>The NetBSD Project</publisher>
@@ -6286,7 +6286,7 @@ license:CC0-1.0
62866286
</part>
62876287
</software>
62886288

6289-
<software name="netbsd_6_0" cloneof="netbsd_6_0_3">
6289+
<software name="netbsd_6_0" cloneof="netbsd_6_0_3" supported="no">
62906290
<description>NetBSD 6.0</description>
62916291
<year>2012</year> <!-- 10/12 -->
62926292
<publisher>The NetBSD Project</publisher>
@@ -6306,7 +6306,7 @@ license:CC0-1.0
63066306
</part>
63076307
</software>
63086308

6309-
<software name="netbsd_6_0_1" cloneof="netbsd_6_0_3">
6309+
<software name="netbsd_6_0_1" cloneof="netbsd_6_0_3" supported="no">
63106310
<description>NetBSD 6.0.1</description>
63116311
<year>2012</year> <!-- 12/12 -->
63126312
<publisher>The NetBSD Project</publisher>
@@ -6326,7 +6326,7 @@ license:CC0-1.0
63266326
</part>
63276327
</software>
63286328

6329-
<software name="netbsd_6_0_2" cloneof="netbsd_6_0_3">
6329+
<software name="netbsd_6_0_2" cloneof="netbsd_6_0_3" supported="no">
63306330
<description>NetBSD 6.0.2</description>
63316331
<year>2013</year> <!-- 05/13 -->
63326332
<publisher>The NetBSD Project</publisher>
@@ -6346,7 +6346,7 @@ license:CC0-1.0
63466346
</part>
63476347
</software>
63486348

6349-
<software name="netbsd_6_0_3">
6349+
<software name="netbsd_6_0_3" supported="no">
63506350
<description>NetBSD 6.0.3</description>
63516351
<year>2013</year> <!-- 09/13 -->
63526352
<publisher>The NetBSD Project</publisher>

‎hash/spectrum_cass.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54223,7 +54223,7 @@ Side B: Once Upon a Lily Pad
5422354223
</software>
5422454224

5422554225
<software name="bruxolc_en_dm1" cloneof="bruxolc">
54226-
<description>Bruxólico (demo 1.0, English)</description>
54226+
<description>Bruxólico (English, demo 1.0)</description>
5422754227
<year>2022</year>
5422854228
<publisher>Amaweks</publisher>
5422954229
<info name="language" value="English" />
@@ -54235,7 +54235,7 @@ Side B: Once Upon a Lily Pad
5423554235
</software>
5423654236

5423754237
<software name="bruxolc_pt_dm1" cloneof="bruxolc">
54238-
<description>Bruxólico (demo 1.0, Portuguese)</description>
54238+
<description>Bruxólico (Portuguese, demo 1.0)</description>
5423954239
<year>2022</year>
5424054240
<publisher>Amaweks</publisher>
5424154241
<info name="language" value="Portuguese (Brazil)" />

‎makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ endif
15781578

15791579
ifeq (posix,$(SHELLTYPE))
15801580
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1581-
@echo '#define BARE_BUILD_VERSION "0.266"' > $@
1581+
@echo '#define BARE_BUILD_VERSION "0.267"' > $@
15821582
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
15831583
@echo 'extern const char bare_build_version[];' >> $@
15841584
@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
15881588
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
15891589
else
15901590
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1591-
@echo #define BARE_BUILD_VERSION "0.266" > $@
1591+
@echo #define BARE_BUILD_VERSION "0.267" > $@
15921592
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
15931593
@echo extern const char bare_build_version[]; >> $@
15941594
@echo extern const char bare_vcs_revision[]; >> $@

‎scripts/minimaws/lib/wsgiserve.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from . import dbaccess
77
from . import htmltmpl
88

9-
import cgi
109
import inspect
1110
import json
1211
import mimetypes
@@ -16,11 +15,12 @@
1615
import urllib
1716
import wsgiref.util
1817

19-
if hasattr(cgi, 'escape'):
20-
htmlescape = cgi.escape
21-
else:
18+
try:
2219
import html
2320
htmlescape = html.escape
21+
except ImportError:
22+
import cgi
23+
htmlescape = cgi.escape
2424

2525
try:
2626
import urllib.parse as urlparse

‎src/devices/cpu/dsp56156/inst.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
// copyright-holders:Andrew Gardner
33
#include "emu.h"
44
#include "inst.h"
5-
#include "emu.h"
65

7-
namespace DSP_56156
8-
{
6+
namespace DSP_56156 {
7+
98
// Factory
109
std::unique_ptr<Instruction> Instruction::decodeInstruction(const Opcode* opc,
1110
const uint16_t word0,
@@ -783,4 +782,4 @@ std::unique_ptr<Instruction> Instruction::decodeInstruction(const Opcode* opc,
783782
return nullptr;
784783
}
785784

786-
}
785+
} // namespace DSP_56156

‎src/devices/cpu/m6805/m68hc05e1.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "emu.h"
88
#include "m68hc05e1.h"
9+
#include "m6805defs.h"
910
#include "6805dasm.h"
1011

1112
#define VERBOSE (0)

‎src/mame/bandai/wswan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ void wswan_state::pockchv2(machine_config &config)
321321
wswan_base(config);
322322

323323
// software lists
324-
SOFTWARE_LIST(config, "pc2_list").set_compatible("pockchalv2");
324+
SOFTWARE_LIST(config, "pc2_list").set_original("pockchalv2");
325325
}
326326

327327
void wscolor_state::wscolor(machine_config &config)

0 commit comments

Comments
 (0)