diff --git a/ChangeLog b/ChangeLog index bd544a1..f381331 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.1 +1.2.1 2014/04/06 - Zooming in/out problem with default font + Close panels with menu or, when built with wxWidgets 3.0, Escape key * Updated Khmer translation diff --git a/configure b/configure index 96680db..f8d14db 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for xmlcopyeditor 1.2.1. +# Generated by GNU Autoconf 2.68 for xmlcopyeditor 1.2.1.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xmlcopyeditor' PACKAGE_TARNAME='xmlcopyeditor' -PACKAGE_VERSION='1.2.1' -PACKAGE_STRING='xmlcopyeditor 1.2.1' +PACKAGE_VERSION='1.2.1.1' +PACKAGE_STRING='xmlcopyeditor 1.2.1.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1313,7 +1313,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 xmlcopyeditor 1.2.1 to adapt to many kinds of systems. +\`configure' configures xmlcopyeditor 1.2.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xmlcopyeditor 1.2.1:";; + short | recursive ) echo "Configuration of xmlcopyeditor 1.2.1.1:";; esac cat <<\_ACEOF @@ -1501,7 +1501,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xmlcopyeditor configure 1.2.1 +xmlcopyeditor configure 1.2.1.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2074,7 +2074,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 xmlcopyeditor $as_me 1.2.1, which was +It was created by xmlcopyeditor $as_me 1.2.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2890,7 +2890,7 @@ fi # Define the identity of the package. PACKAGE='xmlcopyeditor' - VERSION='1.2.1' + VERSION='1.2.1.1' cat >>confdefs.h <<_ACEOF @@ -16159,7 +16159,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 xmlcopyeditor $as_me 1.2.1, which was +This file was extended by xmlcopyeditor $as_me 1.2.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16216,7 +16216,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="\\ -xmlcopyeditor config.status 1.2.1 +xmlcopyeditor config.status 1.2.1.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7cee0ed..8622e56 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([xmlcopyeditor], [1.2.1]) +AC_INIT([xmlcopyeditor], [1.2.1.1]) AC_CONFIG_SRCDIR([src/xmlcopyeditor.cpp]) AM_INIT_AUTOMAKE diff --git a/src/xmlcopyeditor.rc b/src/xmlcopyeditor.rc index 4e95ddf..79d67fb 100644 --- a/src/xmlcopyeditor.rc +++ b/src/xmlcopyeditor.rc @@ -127,8 +127,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1 - PRODUCTVERSION 1,2,1 + FILEVERSION 1,2,1,1 + PRODUCTVERSION 1,2,1,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -147,7 +147,7 @@ BEGIN VALUE "FileDescription", "XML Copy Editor is a fast, free, validating XML editor" VALUE "FileVersion", "" VALUE "InternalName", "xmlcopyeditor.exe" - VALUE "LegalCopyright", "Copyright (c) 2013 Gerald Schmidt" + VALUE "LegalCopyright", "Copyright (c) 2014 Gerald Schmidt" VALUE "OriginalFilename", "XmlCopyEditor.exe" VALUE "ProductName", "XML Copy Editor" VALUE "ProductVersion", "" diff --git a/src/xmlcopyeditorcopy.h b/src/xmlcopyeditorcopy.h index 5f26261..8de8973 100644 --- a/src/xmlcopyeditorcopy.h +++ b/src/xmlcopyeditorcopy.h @@ -55,7 +55,7 @@ "License along with this program; if not, write to the Free\n"\ "Software Foundation, Inc., 59 Temple Place, Suite 330,\n"\ "Boston, MA 02111-1307 USA.") -#define ABOUT_VERSION _T("1.2.1") +#define ABOUT_VERSION _T("1.2.1.1") #define XMLCE_VAR _T("XMLCE_VAR") #ifdef __WXMSW__