Merge branch 'v4.7.x' to get DIFFSTAT, Changelog, etc up to date in master
authorArun Persaud <arun@nubati.net>
Sun, 24 Feb 2013 17:08:39 +0000 (09:08 -0800)
committerArun Persaud <arun@nubati.net>
Sun, 24 Feb 2013 17:08:39 +0000 (09:08 -0800)
commit8663fb7e5de8cf4e4f03eb12cffa53f4b9a8ec2c
tree523e8391a723d639f5402019edac8fa1a287b6f7
parent5827df691d2c5fb085eece1b6e81dcb748bf5de9
parent59ec64025b5234659c7da4b98a6587d1ee3facff
Merge branch 'v4.7.x' to get DIFFSTAT, Changelog, etc up to date in master

Conflicts:
configure.ac
winboard/config.h