Merge from V5_1_main 26/11/2010

diff --git a/bin/appli_clean.sh b/bin/appli_clean.sh
index 40d6ab680cd11877c00ba2cc25efc40100ff39b6..09ad9d3fe9ae22ce40e80d35c01a917b03e26515 100644 (file)
--- 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 a193dd95e45908d8c26c9a1d96899b2ab4039426..8cc5fcec0614b948846ae834356237cad5825f27 100644 (file)
--- 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.