From: nri <nri@opencascade.com>
Date: Fri, 11 Jul 2003 07:30:57 +0000 (+0000)
Subject: NRI : Merge from V1_2.
X-Git-Tag: ihm_1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c413d08944483524b54801b837cf49dcb069dcd;p=modules%2Fgeom.git

NRI : Merge from V1_2.
---

diff --git a/bin/VERSION b/bin/VERSION
index 13a4dd4bc..f38a71b14 100755
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME PRO - GEOM VERSION: 1.1a
+THIS IS SALOME PRO - GEOM VERSION: 1.2
diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 920cad7d6..d6fd95ccc 100755
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME PRO - GEOM - v.1.1a"
-PROJECT_NUMBER         = id#1.0
+PROJECT_NAME           = "SALOME PRO - GEOM - v.1.2"
+PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English
 EXTRACT_ALL            = YES
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 6b636a242..d52af4892 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -22,7 +22,6 @@ doc:
 	cd ..; \
 	cp -f $(srcdir)/INPUT/sources/doxygen.css ./html/doxygen.css
 	cp -fr $(srcdir)/INPUT/sources/ html/
-	cp -fr $(srcdir)/INPUT/exemple/ html/
 	cp -fr $(srcdir)/INPUT/HTML/  html/
 
 clean: