From: Yann Dirson <ydirson@free.fr>
Date: Thu, 16 Jan 2014 21:43:06 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Url: http://winboard.nl/cgi-bin?p=gnushogi.git;a=commitdiff_plain;h=1907f35d3370f971df16e40dec4135110386a84c

Merge branch 'maint'

Conflicts:
	configure.ac
	gnushogi/cursesdsp.h
	gnushogi/dspwrappers.c
	gnushogi/dspwrappers.h
	gnushogi/pattern.c
	gnushogi/rawdsp.h
---

1907f35d3370f971df16e40dec4135110386a84c
diff --cc configure.ac
index 0d11ea0,9213a89..e852a73
--- a/configure.ac
+++ b/configure.ac
@@@ -5,8 -5,7 +5,8 @@@
  dnl Process this file with autoconf to produce a configure script.
  
  AC_PREREQ(2.57)
- AC_INIT([gnushogi],[1.4.1-rc1+],[https://savannah.gnu.org/bugs/?group=gnushogi])
+ AC_INIT([gnushogi],[1.4.1+],[https://savannah.gnu.org/bugs/?group=gnushogi])
 +AM_INIT_AUTOMAKE
  AC_CONFIG_SRCDIR([gnushogi/gnushogi.h])
  AC_CONFIG_HEADER(config.h)
  
diff --cc gnushogi/pattern.c
index 5268b7a,05d15ca..349cd94
--- a/gnushogi/pattern.c
+++ b/gnushogi/pattern.c
@@@ -32,12 -33,8 +33,12 @@@
  #include "gnushogi.h"
  #include "pattern.h"
  
- /* constants and pattern_data are generated by "pat2inc" */
+ /* "pat2inc" generates constants and pattern_data */
 -#include "pattern.inc"
 +#ifndef MINISHOGI
 +# include "gnushogi-pattern.inc"
 +#else
 +# include "gnuminishogi-pattern.inc"
 +#endif
  
  struct Pattern_rec Pattern[MAX_PATTERN];
  struct OpeningSequence_rec OpeningSequence[MAX_OPENING_SEQUENCE];