diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index aa668b45f59..f450c57b31a 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/hash/apricot_flop.xml b/hash/apricot_flop.xml index 306d49e6b3a..7c2cac180bb 100644 --- a/hash/apricot_flop.xml +++ b/hash/apricot_flop.xml @@ -130,7 +130,7 @@ - + Lotus 123 (Release 1A) 1985 Lotus Development Corporation @@ -177,7 +177,7 @@ - + MSD 2.7.0 (Winchester Test) 1986 ACT @@ -189,7 +189,7 @@ - + apricot Networks VR1.3 F-Series 1985 ACT @@ -226,7 +226,7 @@ - + apricot Networks VB1.3 F-Series (Beta Release) 1985 ACT @@ -263,7 +263,7 @@ - + POINT 32 Network Diagnostics 1985 ACT @@ -292,7 +292,7 @@ - + apricot Networks VR1.3 PC/Xi 1985 ACT @@ -329,7 +329,7 @@ - + apricot Networks VB1.3 PC/Xi (Beta Release) 1985 ACT @@ -366,7 +366,7 @@ - + POINT 32 VR1.1 1984 ACT @@ -397,7 +397,7 @@ - + POINT 32 VR1.2 1985 ACT @@ -434,7 +434,7 @@ - + POINT 32 VB1.2 (Beta Release) 1985 ACT @@ -544,7 +544,7 @@ - + Winchester Factory Formatter 2.1 (TES004) 1985 ACT @@ -556,7 +556,7 @@ - + Winchester Data Integrity Test 4.0 (TES002) 1985 ACT @@ -568,7 +568,7 @@ - + Winchester Data Integrity Check 1.1 1984 ACT diff --git a/hash/ekara_japan.xml b/hash/ekara_japan.xml index cd796e9d39e..f36fb674d1a 100644 --- a/hash/ekara_japan.xml +++ b/hash/ekara_japan.xml @@ -149,7 +149,7 @@ 74 *EC0074-JPM J-Pop Mix Volume 37 75 *EC0075-JPM J-Pop Mix Volume 38 76 *EC0076-JPM J-Pop Mix Volume 39 - 77 *EC0077-ATS Artist Selection Volume 15 - unknown artist (should be Vol 15? sales sheet lists 5?) + 77 *EC0077-ATS Artist Selection Volume 15 - Keisuke Kuwata (should be Vol 15? sales sheet lists 5?) 78 *EC0078-JPM J-Pop Mix Volume 40 79 *EC0079-ETZ ETZ 2 (custom presentation etc.) 80 *EC0080-JPM J-Pop Mix Volume 41 @@ -1014,7 +1014,7 @@ - Artist Selection Volume 15 - unknown artist (Japan) (EC0077-ATS) + Artist Selection Volume 15 - Keisuke Kuwata (Japan) (EC0077-ATS) 2001 Takara diff --git a/hash/ekara_japan_g.xml b/hash/ekara_japan_g.xml index 9d2aa468479..aaf8b73851b 100644 --- a/hash/ekara_japan_g.xml +++ b/hash/ekara_japan_g.xml @@ -18,13 +18,13 @@ G-5 GC0005-TPJ TV Pop Volume 1 G-6 *GC0006-BHT BHT Volume 3 (Best Artists?) G-7 *GC0007-BAT BAT Volume 3 (Artist Selection?) - G-8 *GC0008-MIN? untranslated (no volume) + G-8 *GC0008-MIN mini-moni Volume 1 G-9 GC0009-TPJ TV Pop Volume 3 (Volume 2 is 'P-2' in 'P' series) G-10 *GC0010-BAT BAT Volume 4 (Artist Selection?) G-11 GC0011-TPJ TV Pop Volume 4 G-12 GC0012-BHT BHT Volume 5 (Best Artists?) (Volume 4 is 'P-1' in 'P' series) G-13 GC0013- (unknown) Volume 6 - G-14 *GC0014-MIN? (unknown) Volume 2 + G-14 *GC0014-MIN mini-moni Volume 2 G-15 *GC0015-BAT BAT Volume 5 (Artist Selection?) G-16 *GC0016-TPJ TV Pop Volume 5 G-17 *GC0017-TPJ TV Pop Volume 6 @@ -101,7 +101,7 @@ - Mini Moni Volume 1 (Japan) (GC0008-MIN) (set 1) + mini-moni Volume 1 (Japan) (GC0008-MIN) (set 1) 2001 Takara @@ -112,7 +112,7 @@ - MIN Volume 1 (Japan) (GC0008-MIN) (set 2) + mini-moni Volume 1 (Japan) (GC0008-MIN) (set 2) 2001 Takara @@ -148,7 +148,7 @@ - Mini Moni Volume 2 (GC0014-MIN) + mini-moni Volume 2 (GC0014-MIN) 2002 Takara diff --git a/hash/ekara_japan_s.xml b/hash/ekara_japan_s.xml index 38640f6e99d..7f5b4ea833d 100644 --- a/hash/ekara_japan_s.xml +++ b/hash/ekara_japan_s.xml @@ -12,7 +12,7 @@ S-1 SC0001- Hello Kitty Special S-2 SC0002-SAI SAI (series 3) Volume 1 - S-3 *SC0003- unknown(1) Volume 1 + S-3 *SC0003- Kids' Challenge Volume 1 S-4 *SC0004-SAI SAI (series 1) Volume 1 S-5 *SC0005-SAI SAI (series 2) Volume 1 (same series as 6,9,19,21,22) S-6 *SC0006-SAI SAI (series 2) Volume 2 (same series as 5,9,19,21,22) @@ -27,7 +27,7 @@ S-15 SC0015- unknown(2) Volume 2 S-16 SC0016-SAI SAI (series 2) Volume 5 S-17 SC0017- unknown(1) Volume 2 - S-18 *SC0018-SAI (unknown) Volume 1 + S-18 *SC0018-SAI Challenge Artist Volume 1 S-19 *SC0019-SAI SAI (series 2) Volume 6 (same series as 5,6,9,21,22) S-20 SC0020- SAI (series 3) Volume 5 S-21 *SC0021-SAI SAI (series 2) Volume 7 (same series as 5,6,9,19,22) @@ -41,7 +41,7 @@ - unknown(1) Volume 1 (Japan) (SC0003-xxx) + Kids' Challenge Volume 1 (Japan) (SC0003-xxx) 2001 Takara @@ -118,7 +118,7 @@ - (unknown) Volume 1 (SC0018-SAI) + Challenge Artist Volume 1 (Japan) (SC0018-SAI) 2002 Takara diff --git a/hash/jpopira_jp.xml b/hash/jpopira_jp.xml index 90c0b1b18f8..e37e8b367c2 100644 --- a/hash/jpopira_jp.xml +++ b/hash/jpopira_jp.xml @@ -18,7 +18,7 @@ --> - + JP-01 (Japan) 2004 Takara @@ -30,7 +30,7 @@ - + JP-02 (Japan) 2004 Takara diff --git a/makefile b/makefile index 1895eeffcfc..71a5b6b1e5c 100644 --- a/makefile +++ b/makefile @@ -1625,14 +1625,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.206"' > $@ + @echo '#define BARE_BUILD_VERSION "0.207"' > $@ @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: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.206" > $@ + @echo #define BARE_BUILD_VERSION "0.207" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@