diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index ea6f70ec235..cdecdea9a3a 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/advanced/devicemap.rst b/docs/source/advanced/devicemap.rst index aaf1450d4ab..9cfd88e6c56 100644 --- a/docs/source/advanced/devicemap.rst +++ b/docs/source/advanced/devicemap.rst @@ -120,9 +120,6 @@ such as: | Input: Remapped joystick #2: XInput Player 2 (device id: XInput Player 2) | -Note that the devices numbers in the verbose log output are zero-based, while -the device numbers shown in MAME’s user interface and set in configuration files - Limitations ----------- diff --git a/docs/source/conf.py b/docs/source/conf.py index 61f16eb555b..8311d5e4af1 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.248' +version = '0.249' # The full version, including alpha/beta/rc tags. -release = '0.248' +release = '0.249' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/makefile b/makefile index 67f824a9fcc..8cee176b982 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.248"' > $@ + @echo '#define BARE_BUILD_VERSION "0.249"' > $@ @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.248" > $@ + @echo #define BARE_BUILD_VERSION "0.249" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@