Skip to content

Commit 3131c64

Browse files
committed
Merge tag 'mame0277' into HEAD
MAME 0.277
2 parents b7c8cc8 + 84cb445 commit 3131c64

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

android-project/app/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="org.mamedev.mame"
7-
android:versionCode="276"
8-
android:versionName="0.276"
7+
android:versionCode="277"
8+
android:versionName="0.277"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = '0.276'
66+
version = '0.277'
6767
# The full version, including alpha/beta/rc tags.
68-
release = '0.276'
68+
release = '0.277'
6969

7070
# The language for content autogenerated by Sphinx. Refer to documentation
7171
# for a list of supported languages.

makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,7 @@ endif
15281528

15291529
ifeq (posix,$(SHELLTYPE))
15301530
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1531-
@echo '#define BARE_BUILD_VERSION "0.276"' > $@
1531+
@echo '#define BARE_BUILD_VERSION "0.277"' > $@
15321532
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
15331533
@echo 'extern const char bare_build_version[];' >> $@
15341534
@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1538,7 +1538,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
15381538
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
15391539
else
15401540
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
1541-
@echo #define BARE_BUILD_VERSION "0.276" > $@
1541+
@echo #define BARE_BUILD_VERSION "0.277" > $@
15421542
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
15431543
@echo extern const char bare_build_version[]; >> $@
15441544
@echo extern const char bare_vcs_revision[]; >> $@

0 commit comments

Comments
 (0)