Merge branch 'maint'
commit412d775162ff00077244248ea6c69e5d35922b57
authorYann Dirson <ydirson@free.fr>
Fri, 25 Jul 2014 20:38:57 +0000 (25 22:38 +0200)
committerYann Dirson <ydirson@free.fr>
Fri, 25 Jul 2014 20:38:57 +0000 (25 22:38 +0200)
treea8d57af5b19bf267e3ba50742695e3fca3bb91e4
parentcb1707d353e6fab6027050b6941030c354172e65
parent91a2804e7e49672eef8b75531d4551db20b95f83
Merge branch 'maint'

Conflicts:
gnushogi/Makefile.in
NEWS
gnushogi/search.c
gnushogi/tcontrl.c