From f7089d1739ad471e5082cfdda583ca9ea3a1fa66 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 Nov 2010 15:42:56 +0000 Subject: [PATCH] Merge from V5_1_main 26/11/2010 --- bin/appli_clean.sh | 2 +- doc/docutils/conf.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/appli_clean.sh b/bin/appli_clean.sh index 40d6ab680..09ad9d3fe 100644 --- a/bin/appli_clean.sh +++ b/bin/appli_clean.sh @@ -23,7 +23,7 @@ #clean appli -DELCOM="rm -rf bin lib share doc idl env.d envd USERS getAppliPath.py searchFreePort.sh runAppli runConsole runSession runRemote.sh runTests SalomeApp.xml *.pyc *~ .bashrc" +DELCOM="rm -rf bin lib share doc idl env.d envd USERS getAppliPath.py searchFreePort.sh runAppli runConsole runSession runRemote.sh runTests SalomeApp.xml runSalomeScript update_catalogs.py *.pyc *~ .bashrc" DOIT="false" if [ $# -gt 0 ] diff --git a/doc/docutils/conf.py b/doc/docutils/conf.py index a193dd95e..8cc5fcec0 100644 --- a/doc/docutils/conf.py +++ b/doc/docutils/conf.py @@ -54,9 +54,9 @@ copyright = '2010 EDF R&D' # built documents. # # The short X.Y version. -version = '5.1.4' +version = '6.2.0' # The full version, including alpha/beta/rc tags. -release = '5.1.4' +release = '6.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- 2.39.2