Merge branch 'v4.7.x' into master
authorArun Persaud <arun@nubati.net>
Wed, 10 Sep 2014 03:15:45 +0000 (20:15 -0700)
committerArun Persaud <arun@nubati.net>
Wed, 10 Sep 2014 03:18:18 +0000 (20:18 -0700)
commita799eb8719fdd78da3359ab5810adac322ea4365
tree989e1c03d718133bf06f3d7fbdee32c2d5b4f860
parente677df018f76f76bace476a381866294282e9f3f
parentd6ad098f095eb0644827bf4dd6659870a1e09d07
Merge branch 'v4.7.x' into master

Conflicts:
configure.ac
po/da.po
po/de.po
po/es.po
po/it.po
po/ru.po
po/tr.po
po/uk.po
po/vi.po
po/xboard.pot
po/zh_CN.po
po/zh_HK.po
po/zh_TW.po
winboard/config.h
xaw/xboard.c