diff options
| author | 2019-06-27 12:45:40 +1000 | |
|---|---|---|
| committer | 2019-06-27 12:45:40 +1000 | |
| commit | b1689f37e965e85dd97501876f4bc06125b2acc0 (patch) | |
| tree | 89245dad90536ad6a8c1e3f8ef4eb47882a5edfd | |
| parent | 60924e122283d734f63519196f6bb743de28caad (diff) | |
| parent | 90508cc3edfc85dbc21bfbc263fd5837914cdbda (diff) | |
Merge branch 'release0211'
| -rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | hash/cecflop.xml | 2 | ||||
| -rw-r--r-- | hash/spectrum_cass.xml | 6 | ||||
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | src/emu/xtal.h | 4 |
5 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 012f4272f9f..500b0b4eb5c 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="210" - android:versionName="0.210" + android:versionCode="211" + android:versionName="0.211" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/hash/cecflop.xml b/hash/cecflop.xml index de27e7646a5..c95233c9d1e 100644 --- a/hash/cecflop.xml +++ b/hash/cecflop.xml @@ -174,7 +174,7 @@ </software> <software name="printcart"> <!-- Print Cartridges for Chinese Machine --> - <description>Zhōnghuá Jī Dǎyìn Hé</description> + <description>Zhōnghuájī Dǎyìn Hé</description> <year>1993</year> <publisher><unknown></publisher> <info name="alt_title" value="中华机打印盒"/> diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index ce78b63021e..824508e62ef 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -1174,7 +1174,7 @@ </software> <software name="cjantics"> - <description>CJ_s Elephant Antics</description> + <description>CJ's Elephant Antics</description> <year>1991</year> <publisher>Codemasters</publisher> <part name="cass" interface="spectrum_cass"> @@ -1270,7 +1270,7 @@ <!-- possible bad dump, shorter image, doesn't load --> <software name="cobrasarm" cloneof="cobrasar" > - <description>Cobra_s Arc (medium case)</description> + <description>Cobra's Arc (medium case)</description> <year>1986</year> <publisher>Dinamic Software</publisher> <part name="cass" interface="spectrum_cass"> @@ -1722,7 +1722,7 @@ </software> <software name="drdoomsr"> <!-- manual protection --> - <description>Dr. Doom_s Revenge! (The Amazing Spider-Man and Captain America in)</description> + <description>Dr. Doom's Revenge! (The Amazing Spider-Man and Captain America in)</description> <year>19??</year> <publisher><unknown></publisher> <part name="cass" interface="spectrum_cass"> @@ -1628,14 +1628,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.210"' > $@ + @echo '#define BARE_BUILD_VERSION "0.211"' > $@ @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.210" > $@ + @echo #define BARE_BUILD_VERSION "0.211" > $@ @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/emu/xtal.h b/src/emu/xtal.h index 684a13c1959..f3e9b7d0cbd 100644 --- a/src/emu/xtal.h +++ b/src/emu/xtal.h @@ -81,8 +81,8 @@ constexpr XTAL operator *(unsigned int mult, const XTAL &xtal) { return XTAL(xta constexpr XTAL operator *(double mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); } constexpr XTAL operator ""_Hz_XTAL(long double clock) { return XTAL(double(clock)); } -constexpr XTAL operator ""_kHz_XTAL(long double clock) { return XTAL(double(clock) * 1e3); } -constexpr XTAL operator ""_MHz_XTAL(long double clock) { return XTAL(double(clock) * 1e6); } +constexpr XTAL operator ""_kHz_XTAL(long double clock) { return XTAL(double(clock * 1e3)); } +constexpr XTAL operator ""_MHz_XTAL(long double clock) { return XTAL(double(clock * 1e6)); } constexpr XTAL operator ""_Hz_XTAL(unsigned long long clock) { return XTAL(double(clock)); } constexpr XTAL operator ""_kHz_XTAL(unsigned long long clock) { return XTAL(double(clock) * 1e3); } |
