From: Arun Persaud <arun@nubati.net>
Date: Sun, 24 Feb 2013 17:08:39 +0000 (-0800)
Subject: Merge branch 'v4.7.x' to get DIFFSTAT, Changelog, etc up to date in master
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=8663fb7e5de8cf4e4f03eb12cffa53f4b9a8ec2c;hp=59ec64025b5234659c7da4b98a6587d1ee3facff;p=xboard.git

Merge branch 'v4.7.x' to get DIFFSTAT, Changelog, etc up to date in master

Conflicts:
	configure.ac
	winboard/config.h
---

diff --git a/configure.ac b/configure.ac
index bb39cd4..86b135f 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],[4.7.0],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20130224],[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/winboard/config.h b/winboard/config.h
index 60b14ed..e5ecb49 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 4.7.0"
+#define PACKAGE_STRING "WinBoard master-20130224"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "winboard"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.7.0"
+#define PACKAGE_VERSION "master-20130224"
 
 /* Define the Windows-specific FILE version info.  this *MUST* be four comma separated 16-bit integers */
-#define PACKAGE_FILEVERSION 4,7,2013,0205
+#define PACKAGE_FILEVERSION 4,7,2013,0224
 
 #define PTY_ITERATION