Skip to content

Commit cee8cc3

Browse files
mahlemiutmahlemiut
committed
Merge tag 'mame0266' into rel266
MAME 0.266
2 parents 1ce0852 + cd7817b commit cee8cc3

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

Diff for: ‎android-project/app/src/main/AndroidManifest.xml

+2-2
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="265"
8-
android:versionName="0.265"
7+
android:versionCode="266"
8+
android:versionName="0.266"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

Diff for: ‎hash/ekara_cart.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,10 @@ license:CC0-1.0
304304
Japanese cart listing (by KD code)
305305
* = dumped
306306
307-
*KD-1 Kids 20 - Volume 1
308-
*KD-2 Kids 20 - Volume 2
309-
*KD-3 Kids 20 - Volume 3
310-
KD-4 Kids 20 - Volume 4
307+
*KD-1 Kids' Song 20 - Volume 1
308+
*KD-2 Kids' Song 20 - Volume 2
309+
*KD-3 Kids' Song 20 - Volume 3
310+
KD-4 Kids' Song 20 - Volume 4
311311
312312
***********************************************************************************
313313
@@ -318,15 +318,15 @@ license:CC0-1.0
318318
M-2 *MC0002-ATM Artist Mini Volume 2 (PIKA☆NCHI, A·RA·SHI, etc.)
319319
M-3 *MC0003-ATM Artist Mini Volume 3 (Morning Musume)
320320
M-4 *MC0004-ATM Artist Mini Volume 4 (w-inds)
321-
M-5 *MC0005-KSM Kids Song Mini Volume 1 (TV Song)
322-
M-6 *MC0006-KSM Kids Song Mini Volume 2 (TV Hero)
321+
M-5 *MC0005-KSM Kids' Song Mini Volume 1 (TV Song)
322+
M-6 *MC0006-KSM Kids' Song Mini Volume 2 (TV Hero)
323323
M-7 *MC0007-ATM Artist Mini Volume 5 (SMAP, KinKi Kids, ARASHI, TOKIO)
324-
M-8 *MC0008-KSM Kids Song Mini Volume 3
324+
M-8 *MC0008-KSM Kids' Song Mini Volume 3
325325
M-9 *MC0009-JPM J-Pop Mix Mini Volume 1
326326
M-10 *MC0010-ATM Artist Mini Volume 6 (Utada Hikaru)
327-
M-11 *MC0011-KSM Kids Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai O, etc.)
327+
M-11 *MC0011-KSM Kids' Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai o, etc.)
328328
M-12 *MC0012-ATM Artist Mini Volume 7 (Ayumi Hamasaki)
329-
M-13 *MC0013-KSM Kids Song Mini Volume 5
329+
M-13 *MC0013-KSM Kids' Song Mini Volume 5
330330
M-14 *MC0014-ATM Artist Mini Volume 8 (BoA)
331331
M-15 *MC0015-TPM TV Pop Mini Volume 1
332332
M-16 *MC0016-ATM Artist Mini Volume 9 (Yamaguchi Momoe)
@@ -419,7 +419,7 @@ license:CC0-1.0
419419
420420
*KR-1 Kirarin Revolution (comes in kira kara Starter Set bundled with Kirarin Revolution microphone) (inside cart is marked AC0009-KIR)
421421
*BX01-MOR Morning Musume Special (sticker inside cart is marked CS019-004A)
422-
*PR-01 MNG (c)2002 Premium Cartridge Koko ni Iru Zee! Morning Musume (single song 'not for sale' cartridge)
422+
*PR-01 MNG (c)2002 Premium Cartridge Koko ni Iruzee! Morning Musume (single song 'not for sale' cartridge)
423423
PR-02 AYY (c)2003 Aya Matsuura - Prairies Man (single song 'not for sale' cartridge)
424424
*PR-06 Misora Hibari (inside cart is marked AC0009)
425425
@@ -2337,7 +2337,7 @@ license:CC0-1.0
23372337
</software>
23382338

23392339
<software name="mc0005">
2340-
<description>Kids Song Mini Volume 1 (TV Song) (Japan) (MC0005-KSM)</description>
2340+
<description>Kids' Song Mini Volume 1 (TV Song) (Japan) (MC0005-KSM)</description>
23412341
<year>2003</year>
23422342
<publisher>Takara</publisher>
23432343
<info name="alt_title" value="キッズソングミニ mini vol.1 (TVソング)"/>
@@ -2350,7 +2350,7 @@ license:CC0-1.0
23502350
</software>
23512351

23522352
<software name="mc0006">
2353-
<description>Kids Song Mini Volume 2 (TV Hero) (Japan) (MC0006-KSM)</description>
2353+
<description>Kids' Song Mini Volume 2 (TV Hero) (Japan) (MC0006-KSM)</description>
23542354
<year>2003</year>
23552355
<publisher>Takara</publisher>
23562356
<info name="alt_title" value="キッズソングミニ mini vol.2 (TVヒーロー)"/>
@@ -2376,7 +2376,7 @@ license:CC0-1.0
23762376
</software>
23772377

23782378
<software name="mc0008">
2379-
<description>Kids Song Mini Volume 2 (Japan) (MC0008-KSM)</description>
2379+
<description>Kids' Song Mini Volume 2 (Japan) (MC0008-KSM)</description>
23802380
<year>2003</year>
23812381
<publisher>Takara</publisher>
23822382
<info name="alt_title" value="キッズソングミニ mini vol.3"/>
@@ -2415,7 +2415,7 @@ license:CC0-1.0
24152415
</software>
24162416

24172417
<software name="mc0011">
2418-
<description>Kids Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai O, etc.) (Japan) (MC0011-KSM)</description>
2418+
<description>Kids' Song Mini Volume 4 (Micky Mouse March, Hoshi ni Negai o, etc.) (Japan) (MC0011-KSM)</description>
24192419
<year>2003</year>
24202420
<publisher>Takara</publisher>
24212421
<info name="alt_title" value="アーティストミニ mini vol.4 (ミッキーマウス・マーチ／星に願いを／他)"/>
@@ -2442,7 +2442,7 @@ license:CC0-1.0
24422442
</software>
24432443

24442444
<software name="mc0013">
2445-
<description>Kids Song Mini Volume 5 (Japan) (MC0013-KSM)</description>
2445+
<description>Kids' Song Mini Volume 5 (Japan) (MC0013-KSM)</description>
24462446
<year>2003</year>
24472447
<publisher>Takara</publisher>
24482448
<info name="alt_title" value="キッズソングミニ mini vol.5"/>
@@ -2957,7 +2957,7 @@ license:CC0-1.0
29572957
</software>
29582958

29592959
<software name="pr01">
2960-
<description>PR-01 Premium Cartridge Koko ni Iru Zee! Morning Musume (Not for Sale, Japan)</description>
2960+
<description>PR-01 Premium Cartridge Koko ni Iruzee! Morning Musume (Not for Sale, Japan)</description>
29612961
<year>2002</year>
29622962
<publisher>Takara</publisher>
29632963
<info name="alt_title" value="プレミアムカートリッジ ここにいるぜえ！ モーニング娘。" />

Diff for: ‎makefile

+2-2
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.265"' > $@
1581+
@echo '#define BARE_BUILD_VERSION "0.266"' > $@
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 "W (" BARE_VCS_REVISION ")";' >> $@
15891589
else
15901590
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1591-
@echo #define BARE_BUILD_VERSION "0.265" > $@
1591+
@echo #define BARE_BUILD_VERSION "0.266" > $@
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[]; >> $@

Diff for: ‎src/mame/skeleton/cubieboard4.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ ROM_END
9797
COMP( 20??, cubieboard4, 0, 0, cubiecca80, cubiecca80, cubiecca80_state, empty_init, "Cubietech Limited", "Cubieboard4 (CC A-20)", MACHINE_IS_SKELETON )
9898

9999
// Arcade games
100-
GAME( 20??, monkeyjmp, cubieboard4, cubiecca80, cubiecca80, cubiecca80_state, empty_init, ROT90, "Falgas", "Monkey Jump", MACHINE_IS_SKELETON )
100+
GAME( 20??, monkeyjmp, 0, cubiecca80, cubiecca80, cubiecca80_state, empty_init, ROT90, "Falgas", "Monkey Jump", MACHINE_IS_SKELETON )

0 commit comments

Comments
 (0)