mirror of
https://github.com/holub/mame
synced 2025-07-05 18:08:04 +03:00
MAME 0.254
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmRH780ACgkQwXSxAYxA cQ7d4g/+Mq3wSZv7FPM0ZCD0vk9ysjYZZZYiEjXMFthdr7mCBXlVfJJoByaaarYm A4SLkXwxA2X7CfInGFQzbh+xFUuRIb0jzYbDCfGeKKqzHLo1t1TJQLSeFiVZXdJi wEh3aKcG2c2ZOfU8EnwBh5hOlVCBWmS8ZnGDNI6CTcSavV6vzU6Vf7cKcnPhcQZx fY+7LZi6KxoMFl62FtX3KKHf9ImUDP3IAqw1pHai8MbR7t+hyXBw18Wc85YSzX2Z jDhNp85QpFGVAYjzHkJ0wklwTjMCYVjcQwhMCK+xCeBFRaOazPXRr+PtIW0VsvCS B6ibZN6134DBCihiCZYnJYkZIOncXcFzzUUIKQBfYN4DWQLqJ9Bu5go4amI5pi5W FTEd3PMUfDYP43L8lVMM9bB+Dh6+RS9HJww4fT6WdcGSNIteD6mhudtmJTkJknPi mdX4Hey+hQ1MjKfmkTV8yFoBCg2cfo/2j0Q2jTXymJrzpJMA0sYrmUqXSPUhgsVu LUeNuS/kqkANLY347jxmMcehW1BhNGFVbs7n0xPaxgnGCH913lXCqMCJTNVFIIsP iiz5OZVFWm4+RXwDCH8qYrUlAcl+C1L1WQm65RqKXeny7q03+499tO4EyHYvbiE+ n6Ybvpo/JByqIPOHlSaC5zg1aBijtOpkqxTAt3uO432l1iu7C8A= =9Kjn -----END PGP SIGNATURE----- Merge tag 'mame0254' into mainline-master MAME 0.254
This commit is contained in:
commit
d7c8d0c52e
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="253"
|
||||
android:versionName="0.253"
|
||||
android:versionCode="254"
|
||||
android:versionName="0.254"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
4
makefile
4
makefile
@ -1561,7 +1561,7 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.253"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.254"' > $@
|
||||
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
|
||||
@echo 'extern const char bare_build_version[];' >> $@
|
||||
@echo 'extern const char bare_vcs_revision[];' >> $@
|
||||
@ -1571,7 +1571,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.253" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.254" > $@
|
||||
@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