svn merge -r31:HEAD svn://nepal.der.edf.fr/OPENTURNS/GENERICSOLVER_SRC/branches/YACS_...

diff --cc build_configure
index 1b5fd313e8bbba1a64c18b71b320b130784b64de,b2c03c9f1aa2f56c46ad5246ca1cd31f27363c0a..2ce80a3b38f4cc4f0882cc8086c033ea56e1de4f
--- 1/build_configure
--- 2/build_configure
+++ b/build_configure
@@@ -17,6 -20,15 +17,9 @@@
  #
  #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
 -# Tool for updating list of .in file for the SALOME project 
 -# and regenerating configure script
 -# Author : 
 -# Modified by : Alexander BORODIN (OCN) - autotools usage
 -# Date : 10/10/2002
 -#
+ # $Id$
+ #
+ 
  ORIG_DIR=`pwd`
  CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
  

diff --cc configure.ac
index 4c8b8d2026c6561c4248dd8e85119c9d668543cf,14eab81a00dc723ce1baffd9c5200ab2e912ea03..61ea209a1b06eed439bb1f49adc10f5c730f9b3b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -16,8 -19,14 +16,10 @@@
  #
  #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
 -# Author : Marc Tajchman (CEA)
 -# Date : 28/06/2001
 -# Modified by : Patrick GOLDBRONN (CEA)
 -# Modified by : Marc Tajchman (CEA)
+ # $Id$
+ #
  
- AC_INIT([Salome Project GENERICSOLVER module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeGENERICSOLVER])
 -AC_INIT([Salome GENERICSOLVER module],[5.1.3],[webmaster.salome@opencascade.com],[SalomeGENERICSOLVER])
++AC_INIT([Salome GENERICSOLVER module],[5.1.5],[webmaster.salome@opencascade.com],[SalomeGENERICSOLVER])
  AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
  AC_CANONICAL_HOST
  AC_CANONICAL_TARGET

diff --cc idl/GENERICSOLVER_Gen.idl
Simple merge

diff --cc resources/GENERICSOLVERCatalog.xml.in
Simple merge

diff --cc src/GENERICSOLVER/GENERICSOLVER.py
Simple merge

diff --cc src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
index 22a8be718ac0fe9842d193bb88d59c30b101e38b,65b8864be99038d1d0738222a1bdcdaf57d64017..3ccc72c5e72b11e21fe873fae2a5b675a6030a00
--- 1/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
--- 2/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
+++ b/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
@@@ -16,7 -19,14 +16,10 @@@
  #
  #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
 -# ---
 -# File   : GENERICSOLVERGUI.py
 -# Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 -# ---
 -#
 +
+ # $Id$
+ #
+ 
  import traceback
  import os
  from PyQt4.QtGui import *