Merge branch 'maint' into HEAD
authorYann Dirson <ydirson@free.fr>
Mon, 17 Feb 2014 22:01:48 +0000 (23:01 +0100)
committerYann Dirson <ydirson@free.fr>
Mon, 17 Feb 2014 22:01:48 +0000 (23:01 +0100)
commit7496586755298a8115a3988a8b52b32d41a4dcb7
treecd15f57a9c484f04278da3054b9cc009a76100ad
parentcc242a46a66fc6579360f3257f9b7f295a7e7996
parent3abc03f7170b55bfcf97c4009abb570f62e48a24
Merge branch 'maint' into HEAD

Conflicts:
NEWS
configure.ac
gnushogi/cursesdsp.c
NEWS
TODO
configure.ac
gnushogi/commondsp.c
gnushogi/cursesdsp.c
gnushogi/gnushogi.h
gnushogi/rawdsp.c
gnushogi/util.c