Merge branch 'maint' into master

author Yann Dirson <ydirson@free.fr>

Thu, 5 Dec 2013 22:31:07 +0000 (23:31 +0100)

committer Yann Dirson <ydirson@free.fr>

Thu, 5 Dec 2013 22:31:52 +0000 (23:31 +0100)
author Yann Dirson <ydirson@free.fr>
Thu, 5 Dec 2013 22:31:07 +0000 (23:31 +0100)
committer Yann Dirson <ydirson@free.fr>
Thu, 5 Dec 2013 22:31:52 +0000 (23:31 +0100)
diff --cc configure.ac
Simple merge
diff --cc gnushogi/commondsp.c
Simple merge
diff --cc gnushogi/cursesdsp.c
Simple merge
diff --cc gnushogi/rawdsp.c
Simple merge
author	Yann Dirson <ydirson@free.fr>
	Thu, 5 Dec 2013 22:31:07 +0000 (23:31 +0100)
committer	Yann Dirson <ydirson@free.fr>
	Thu, 5 Dec 2013 22:31:52 +0000 (23:31 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
gnushogi/commondsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
gnushogi/cursesdsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
gnushogi/rawdsp.c	patch \|	diff1 \|	diff2 \|	blob \| history