MAME 0.247
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmMORaEACgkQwXSxAYxA cQ5iSBAAvtVuhvRmABdl++wXHGD5b9J9ShF4RwUJpz7u1pmYF5GovXcn+wTNm7HN XvIew4JE+5gyfxUWoSfwJIJEtiLYj7oVgXo92FjLEUZAcK7y7g6yoyfw1x4xDCxE O1QWpPjqfpNYUNzQIcB4i0h7/Bt0DSU34obcdX7Tf+1MdgzZF8+yrimMut1gUMXv 6ErdSSLe7oF7ADmppgGPokbJt79KNyyH/I5DkANuQmQNOS7aDHxZGteqo1+lHs43 /08YsMvkQI9+f0dC1UuaHebHHD1wx+upyrl7bzPjY9x0kR9lhjZQGweMHLCa9Oce ioBLgq+7LA6UBtBuL/vHHUJQmr7ZPJTicwg5gqe5nDuBZcAezX8YY4LTO6B5+SUB DseD7Lth/jzRs8A0IPnErtetW/TAIyGn9xQw/cjvOMCfbGptOqDNuhFu2Hmbu+7S WhQ999gOa0QJVWzqAJ70gpMjVsuIAFnt759VsCMxIIYa/M2zYsYhbCRjhGh8bHjn RaEc5/PGT/WZl/gfElUfSGCztbkjCjRY+QbKta/ChI0CIjtPp6KzIZPnWIIB5kp5 N8tLhn9sfuft9tLJFGFIViwqfnEP7K2hEVpSBek7kY6qjK3cMhtuioVvCKByhRvv 4rd6Vh2ZVxzITwlAXY24gcq/jbksz9UzfN2Q6Dv+Y39sXlNHa1c= =sCJx -----END PGP SIGNATURE----- Merge tag 'mame0247' into mainline-master MAME 0.247
This commit is contained in:
commit
35d2b1d33b
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="246"
|
||||
android:versionName="0.246"
|
||||
android:versionCode="247"
|
||||
android:versionName="0.247"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -63,9 +63,9 @@ copyright = u'1997-2022, MAMEdev and contributors'
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '0.246'
|
||||
version = '0.247'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.246'
|
||||
release = '0.247'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
4
makefile
4
makefile
@ -1579,7 +1579,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.246"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.247"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
@ -1589,7 +1589,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
|
||||
else
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo #define BARE_BUILD_VERSION "0.246" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.247" > $@
|
||||
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
|
||||
@echo extern const char bare_build_version[]; >> $@
|
||||
@echo extern const char bare_vcs_revision[]; >> $@
|
||||
|
Loading…
Reference in New Issue
Block a user