Skip to content

Commit

Permalink
Merge branch 'develop' into develop-win-sdl1-async-hack-201802
Browse files Browse the repository at this point in the history
  • Loading branch information
joncampbell123 committed Feb 14, 2018
2 parents 3282d14 + 15895b3 commit 9ef3a98
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NEXT
0.82.3 (02/13/2018)
- Removed DOSBox SVN-style "fast" A20 gate emulation.
Recent changes make it infeasible to keep. "fast" is
now mapped to "mask" mode.
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for dosbox-x 0.82.2.
# Generated by GNU Autoconf 2.69 for dosbox-x 0.82.3.
#
# Report bugs to <https://github.com/joncampbell123/dosbox-x/issues>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dosbox-x'
PACKAGE_TARNAME='dosbox-x'
PACKAGE_VERSION='0.82.2'
PACKAGE_STRING='dosbox-x 0.82.2'
PACKAGE_VERSION='0.82.3'
PACKAGE_STRING='dosbox-x 0.82.3'
PACKAGE_BUGREPORT='https://github.com/joncampbell123/dosbox-x/issues'
PACKAGE_URL='http://dosbox-x.software'

Expand Down Expand Up @@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures dosbox-x 0.82.2 to adapt to many kinds of systems.
\`configure' configures dosbox-x 0.82.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1390,7 +1390,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of dosbox-x 0.82.2:";;
short | recursive ) echo "Configuration of dosbox-x 0.82.3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
dosbox-x configure 0.82.2
dosbox-x configure 0.82.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2155,7 +2155,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by dosbox-x $as_me 0.82.2, which was
It was created by dosbox-x $as_me 0.82.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -3109,7 +3109,7 @@ fi
# Define the identity of the package.
PACKAGE='dosbox-x'
VERSION='0.82.2'
VERSION='0.82.3'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -8408,7 +8408,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by dosbox-x $as_me 0.82.2, which was
This file was extended by dosbox-x $as_me 0.82.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -8475,7 +8475,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
dosbox-x config.status 0.82.2
dosbox-x config.status 0.82.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
6 changes: 3 additions & 3 deletions vs2015/config_package.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#define PACKAGE "dosbox-x"
#define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues"
#define PACKAGE_NAME "dosbox-x"
#define PACKAGE_STRING "dosbox-x 0.82.2"
#define PACKAGE_STRING "dosbox-x 0.82.3"
#define PACKAGE_TARNAME "dosbox-x"
#define PACKAGE_URL "http://dosbox-x.software"
#define PACKAGE_VERSION "0.82.2"
#define VERSION "0.82.2"
#define PACKAGE_VERSION "0.82.3"
#define VERSION "0.82.3"

0 comments on commit 9ef3a98

Please sign in to comment.