Merge branch 'maint'
authorYann Dirson <ydirson@free.fr>
Thu, 16 Jan 2014 21:43:06 +0000 (22:43 +0100)
committerYann Dirson <ydirson@free.fr>
Thu, 16 Jan 2014 21:43:06 +0000 (22:43 +0100)
commit1907f35d3370f971df16e40dec4135110386a84c
tree9489e7879d37ca430a9c04481635ea73f9592fe3
parentc0d73b60ca186f948ba16682beec5da33d31f9c7
parent2e0ba7d65fd8be45d46122e07ca246a762e1edb6
Merge branch 'maint'

Conflicts:
configure.ac
gnushogi/cursesdsp.h
gnushogi/dspwrappers.c
gnushogi/dspwrappers.h
gnushogi/pattern.c
gnushogi/rawdsp.h
18 files changed:
configure.ac
gnushogi/Makefile.in
gnushogi/book.c
gnushogi/commondsp.c
gnushogi/cursesdsp.c
gnushogi/eval.c
gnushogi/genmove.c
gnushogi/gnushogi.h
gnushogi/init-common.c
gnushogi/init.c
gnushogi/main.c
gnushogi/makepattern.c
gnushogi/pat2inc.c
gnushogi/pattern.c
gnushogi/rawdsp.c
gnushogi/search.c
gnushogi/tcontrl.c
gnushogi/util.c