From: Arun Persaud Date: Fri, 10 Feb 2012 06:49:40 +0000 (-0800) Subject: Merge branch 'master' into v4.6.x X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=e37709f9f59f2dcfb6c7768b50e8d0cc6031ac66;hp=cc08ac5dc0f7a6c558603e979da726270883ae76;p=xboard.git Merge branch 'master' into v4.6.x --- diff --git a/configure.ac b/configure.ac index 0a1f77d..e1c7746 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ dnl| to regenerate configure. Then submit your changes to be folded into dnl| the standard version of xboard. dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j -AC_INIT([xboard],[master-20110822],[bug-xboard@gnu.org]) +AC_INIT([xboard],[4.6.0.20111203],[bug-xboard@gnu.org]) dnl| need this to be able to compile some files in a subdir (filebrowser) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/po/da.po b/po/da.po index 4385ac7..56a0237 100644 --- a/po/da.po +++ b/po/da.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard 4.6.0.20111101\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: 2011-12-03 00:55+0100\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 6b320f5..d516f1a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: XBoard 4.2.7\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: 2011-04-24 12:00-0700\n" "Last-Translator: Arun Persaud \n" "Language-Team: German\n" diff --git a/po/es.po b/po/es.po index c73f7ec..18fcbcf 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard master-20110411\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/it.po b/po/it.po index 5e42233..4bd569d 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard master-20110411\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru.po b/po/ru.po index 0f32bed..d14f01b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/tr.po b/po/tr.po index 813199d..5dd65fb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: XBoard 4.2.7\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: 2003-12-26 16:38+0200\n" "Last-Translator: A. Alper Atýcý \n" "Language-Team: Turkish \n" diff --git a/po/vi.po b/po/vi.po index a169c84..6b89ec7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/xboard.pot b/po/xboard.pot index e3612b3..ce54905 100644 --- a/po/xboard.pot +++ b/po/xboard.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU xboard master-20110822\n" +"Project-Id-Version: GNU xboard 4.6.0.20111203\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 879f76a..e373649 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh_HK.po b/po/zh_HK.po index 28d2d4a..26a0811 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard master-20110411\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index afa971a..6ea6adf 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU xboard master-20110507\n" "Report-Msgid-Bugs-To: bug-xboard@gnu.org\n" -"POT-Creation-Date: 2011-12-03 08:07-0800\n" +"POT-Creation-Date: 2011-12-03 08:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/winboard/config.h b/winboard/config.h index f112dcf..f2ec24e 100644 --- a/winboard/config.h +++ b/winboard/config.h @@ -46,16 +46,16 @@ #define PACKAGE_NAME "WinBoard" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "WinBoard master-20110822" +#define PACKAGE_STRING "WinBoard 4.6.0.20111203" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "winboard" /* Define to the version of this package. */ -#define PACKAGE_VERSION "master-20110822" +#define PACKAGE_VERSION "4.6.0.20111203" /* Define the Windows-specific FILE version info. this *MUST* be four comma separated 16-bit integers */ -#define PACKAGE_FILEVERSION 4,5,1,5 +#define PACKAGE_FILEVERSION 4,5,1,7 #define PTY_ITERATION