Skip to content

Commit

Permalink
Merge tag 'mame0208' into rel208
Browse files Browse the repository at this point in the history
MAME 0.208
  • Loading branch information
mahlemiut committed Mar 27, 2019
2 parents 19e6af3 + 9483624 commit 9437fc0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions android-project/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="207"
android:versionName="0.207"
android:versionCode="208"
android:versionName="0.208"
android:installLocation="auto">

<!-- OpenGL ES 2.0 -->
Expand Down
2 changes: 1 addition & 1 deletion hash/spectrum_flop_opus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@
</software>

<software name="sdcxmas90">
<description>Spectrum Discovery Club Newsletter Xmas Bonus December1990</description>
<description>Spectrum Discovery Club Newsletter Xmas Bonus December 1990</description>
<year>1990</year>
<publisher>Spectrum Discovery Club</publisher>
<part name="flop1" interface="floppy_3_5">
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1625,14 +1625,14 @@ endif

ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.207"' > $@
@echo '#define BARE_BUILD_VERSION "0.208"' > $@
@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 "W ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
@echo #define BARE_BUILD_VERSION "0.207" > $@
@echo #define BARE_BUILD_VERSION "0.208" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
Expand Down

0 comments on commit 9437fc0

Please sign in to comment.