From: Renaud Barate <renaud.barate@edf.fr>
Date: Thu, 24 Jun 2010 15:49:46 +0000 (+0000)
Subject: svn merge -r31:HEAD svn://nepal.der.edf.fr/OPENTURNS/GENERICSOLVER_SRC/branches/YACS_... 
X-Git-Tag: V5_1_5~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4a890ef78d8733d7a2b57ecc2012f7b0d8a63ea4;p=samples%2Fgenericsolver.git

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

4a890ef78d8733d7a2b57ecc2012f7b0d8a63ea4
diff --cc build_configure
index 1b5fd31,b2c03c9..2ce80a3
--- a/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 4c8b8d2,14eab81..61ea209
--- a/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 src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
index 22a8be7,65b8864..3ccc72c
--- a/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 *