summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-09-28 07:01:24 +1000
committer Vas Crabb <vas@vastheman.com>2022-09-28 07:01:24 +1000
commit8bc84c08eac68680bbba36d19d300369ac7b6ab7 (patch)
tree825eb30790d4257fae736ff194cd5e0900b6dd52
parent2922dc82a55f181869531549cfbfb10484a270eb (diff)
parent2d3d0deec8fa4025ea51c1722a21e6b9a7a8bb92 (diff)
Merge tag 'mame0248' into mainline-master
MAME 0.248
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--docs/source/conf.py4
-rw-r--r--docs/source/usingmame/mamemenus.rst4
-rw-r--r--makefile4
4 files changed, 8 insertions, 8 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 16879df99a7..ea6f70ec235 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="247"
- android:versionName="0.247"
+ android:versionCode="248"
+ android:versionName="0.248"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->
diff --git a/docs/source/conf.py b/docs/source/conf.py
index a90bc66c54f..61f16eb555b 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -63,9 +63,9 @@ copyright = u'1997-2022, MAMEdev and contributors'
# built documents.
#
# The short X.Y version.
-version = '0.247'
+version = '0.248'
# The full version, including alpha/beta/rc tags.
-release = '0.247'
+release = '0.248'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/source/usingmame/mamemenus.rst b/docs/source/usingmame/mamemenus.rst
index 819965f4964..a7010a082fe 100644
--- a/docs/source/usingmame/mamemenus.rst
+++ b/docs/source/usingmame/mamemenus.rst
@@ -267,8 +267,8 @@ your current settings. Recognised input devices depend on the
enabled or disabled using the :ref:`mouse <mame-commandline-nomouse>`,
:ref:`lightgun <mame-commandline-nolightgun>` and :ref:`joystick
<mame-commandline-nojoystick>` options. You can reach the Input Devices menu by
-selecting **Input Devices** from the :ref:`main menu <menus-main>` or the
-General Settings menu.
+selecting **Input Devices** from the :ref:`Input Settings menu
+<menus-inputopts>` or the General Settings menu.
Input devices are grouped by device class (for example keyboards or light guns).
You can move between device classes using the **Next Group** and **Previous
diff --git a/makefile b/makefile
index 02f1375c849..67f824a9fcc 100644
--- a/makefile
+++ b/makefile
@@ -1579,7 +1579,7 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.247"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.248"' > $@
@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.247" > $@
+ @echo #define BARE_BUILD_VERSION "0.248" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@