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=-c;p=xboard.git

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

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

8663fb7e5de8cf4e4f03eb12cffa53f4b9a8ec2c