Remove redundant $Header from files (to minimize conflicts during merges)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 3d62fcb8a562902a704bd4fbd48979a042d3dc71..fa76ead8a6046429fc0fe9d0ea5715a56ea37e51 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -23,7 +23,6 @@
 # -* Makefile *- 
 # Author : Guillaume Boulant (CSSI)
 # Module : KERNEL
-# $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/build_configure b/build_configure
index dfdad322fff9a6ef6eff231ad8daa150ff8d419e..269aa907c29a9288302f02f05ffcedb96d3f7937 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -25,9 +25,8 @@
 # and regenerating configure script
 # Author : Marc Tajchman - CEA
 # Date : 10/10/2002
-# $Header$
 # 26/10/2006: Mikhail PONIKAROV - OCN
-# Reorganization for uage of autotools
+# Reorganization for usage of autotools
 #
 ORIG_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6fd352bfeff6b2cdd621e62c0e0793ef858a42dc..a1f146a09515f14673b3df4e47899e2aea36c80f 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,7 +23,6 @@
 # -* Makefile *- 
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 30/11/2001
-# $Header$
 #
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am

diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index 1cdadbb48e305e64611e9a4a2516c9d034bc7ebb..d32ff456b3d0a7d6656b70701f3e193ea4377ab6 100644 (file)
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -23,7 +23,6 @@
 # -* Makefile *- 
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 30/11/2001
-# $Header$
 #
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 9f4e08508a1cb6316794ccd63e9ca436b259f458..b3d3a85a16deb6b364e6c982c715b27ea58e3351 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -23,7 +23,6 @@
 # -* Makefile *- 
 # Author : Guillaume Boulant (CSSI)
 # Module : KERNEL 
-# $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/CAF/Makefile.am b/src/CAF/Makefile.am
index 9206827b0cf1e2c3d476432ca38d44e1f660a4e4..cd88e2c27ffe0360feca622ad0e7b279c5ee72d0 100755 (executable)
--- a/src/CAF/Makefile.am
+++ b/src/CAF/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : caf
-#  $Header$
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/CAM/Makefile.am b/src/CAM/Makefile.am
index 4359790fbfe9bc1f223fc71671496489a9e9f241..b6ee16ad1dbe3d3c3ed919fe879e75431ba099b8 100755 (executable)
--- a/src/CAM/Makefile.am
+++ b/src/CAM/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : CAM
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/DDS/Makefile.am b/src/DDS/Makefile.am
index c3b333fc931e02d956e137435efe0f60e89ba97a..705e9857fe2f90f8f835e9699f004370f811a71a 100755 (executable)
--- a/src/DDS/Makefile.am
+++ b/src/DDS/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Alexander SOLOVYOV (OCN)
 #  Module : DDS
-#  $Header$
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/Event/Makefile.am b/src/Event/Makefile.am
index 612abc06d27bd853929e47d65cb5f1d005bc650c..bc2a4f2a8acdc242e6b929df64f1ca20de023511 100755 (executable)
--- a/src/Event/Makefile.am
+++ b/src/Event/Makefile.am
@@ -24,7 +24,6 @@
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)
 #  Module : SALOME
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/GLViewer/Makefile.am b/src/GLViewer/Makefile.am
index 7ac304a93474994f8bd8cb6e3997b35edb75cc81..e1dece75087ba594a8222ec39b04daf5a90b3936 100644 (file)
--- a/src/GLViewer/Makefile.am
+++ b/src/GLViewer/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : caf
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am
index 9c3029a9ca6489c3abb7c6ba1261799e6913e4e8..4edeb9bf447a03268cfc33c64ea218f7a41222be 100755 (executable)
--- a/src/LightApp/Makefile.am
+++ b/src/LightApp/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : OCC team (OCN)
 #  Module : LightApp
-#  $Header$
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/LogWindow/Makefile.am b/src/LogWindow/Makefile.am
index f0c0ee556908ab08b9278bc88e7d96bb52325e33..6abb2b87ae86b99f6296d910a7fd065c5e9a4997 100755 (executable)
--- a/src/LogWindow/Makefile.am
+++ b/src/LogWindow/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : LogWindow
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/ObjBrowser/Makefile.am b/src/ObjBrowser/Makefile.am
index 7c96eb3990bc5a9d4e76af0c0ec0918fd1314734..0bb77d82776b9ec320d661e36f2de9a50029a07b 100755 (executable)
--- a/src/ObjBrowser/Makefile.am
+++ b/src/ObjBrowser/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : ObjectBrowser
-# $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/OpenGLUtils/Makefile.am b/src/OpenGLUtils/Makefile.am
index 665488d411c17e4632726fe4d3a17e460efac8ee..78ca6877ec29f88a63bca68be655a703a6bf0074 100755 (executable)
--- a/src/OpenGLUtils/Makefile.am
+++ b/src/OpenGLUtils/Makefile.am
@@ -20,7 +20,6 @@
 #  File   : Makefile.am
 #  Author : Oleg UVAROV
 #  Module : SALOME
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/Plot2d/Makefile.am b/src/Plot2d/Makefile.am
index f806f9b6fccd207a7cbee67b13da6cbce2281f21..026e2500923b1d051b2c8aaa90de2912e94157e4 100755 (executable)
--- a/src/Plot2d/Makefile.am
+++ b/src/Plot2d/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : Plot2d
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/PyConsole/Makefile.am b/src/PyConsole/Makefile.am
index 5cddb3f7462e627dd920e3dad08c9bcee8024ba3..1b280749604b39aba825e4d53a1cbe7bc29ac8b2 100755 (executable)
--- a/src/PyConsole/Makefile.am
+++ b/src/PyConsole/Makefile.am
@@ -20,7 +20,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : PyConsole
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/QDS/Makefile.am b/src/QDS/Makefile.am
index 8fe75f8774117d9a10439788b80d2bc08d5a87d6..d926b2fb61beb1750cdef8f0b19180975c142c92 100755 (executable)
--- a/src/QDS/Makefile.am
+++ b/src/QDS/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Alexander SOLOVYOV (OCN)
 #  Module : QDS
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am
index ec99c79c719989e8a2c6b2581cf96f357386149c..0833d5aa5422581f1098500515fb671ed724805f 100755 (executable)
--- a/src/Qtx/Makefile.am
+++ b/src/Qtx/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : suit
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/SALOME_PY/Makefile.am b/src/SALOME_PY/Makefile.am
index c4b48bd4874a82207cfcabe62062ad8b6fc00bcc..a9292e6b3012d04d428fc4a2a7927d17e4092b11 100755 (executable)
--- a/src/SALOME_PY/Makefile.am
+++ b/src/SALOME_PY/Makefile.am
@@ -24,7 +24,6 @@
 #  File   : Makefile.in
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/SALOME_PYQT/Makefile.am b/src/SALOME_PYQT/Makefile.am
index f7ec51cb2e608dd2547d6b1e09160003f3050f2a..f90b383f921c13ff711caf393b15cd03a97b9fe5 100755 (executable)
--- a/src/SALOME_PYQT/Makefile.am
+++ b/src/SALOME_PYQT/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Patrick GOLDBRONN (CEA)
 #  Module : SALOME
-# $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/SALOME_SWIG/Makefile.am b/src/SALOME_SWIG/Makefile.am
index 54e492d6eba76bcb55dfe2150919c4fbdc65b59d..ffb16b0829c3f9b5512462fe4d05998d574f16cd 100755 (executable)
--- a/src/SALOME_SWIG/Makefile.am
+++ b/src/SALOME_SWIG/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/SOCC/Makefile.am b/src/SOCC/Makefile.am
index 6de12512ad475e89be95f0b619a4401d20288ab8..f4e1310369d95b06822ce78803556c0fc9c7c300 100755 (executable)
--- a/src/SOCC/Makefile.am
+++ b/src/SOCC/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Alexander Solovyov(OCN)
 #  Module : SOCC
-# $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/STD/Makefile.am b/src/STD/Makefile.am
index b376e7536fd6349261b6e7e3e7cde62276b6ecfd..ad81db1afb279c7ca730cdb40539616a4f0380f3 100755 (executable)
--- a/src/STD/Makefile.am
+++ b/src/STD/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : STD
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/SUITApp/Makefile.am b/src/SUITApp/Makefile.am
index d4dda85518d47f051788d37b69bcb39b595dd4ad..52f34ff444f3142e091262be5b63f1ceaccf2fdb 100644 (file)
--- a/src/SUITApp/Makefile.am
+++ b/src/SUITApp/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : suitApp
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am
index 9ed873df74c639a4d770b8553882522e451ede5c..6321634e695f7f31f8f16114f6038bd8a3da5430 100755 (executable)
--- a/src/SalomeApp/Makefile.am
+++ b/src/SalomeApp/Makefile.am
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : SalomeApp
-#  $Header$
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/Session/Makefile.am b/src/Session/Makefile.am
index 26a25db0cb5bb12505feb3fd8b10fcafee5d29ef..4b0fb92ea4aefd83008f7b727a9e469bfa634285 100755 (executable)
--- a/src/Session/Makefile.am
+++ b/src/Session/Makefile.am
@@ -24,7 +24,6 @@
 #  File   : Makefile.in
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME
-#  $Header$
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/TOOLSGUI/Makefile.am b/src/TOOLSGUI/Makefile.am
index 690f731d385a1a94e8c2f940dcfa9bfd240e06fb..200e55c618eca8aaa2ea6e555adc1f19dde41b9f 100755 (executable)
--- a/src/TOOLSGUI/Makefile.am
+++ b/src/TOOLSGUI/Makefile.am
@@ -24,7 +24,6 @@
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)
 #  Module : SALOME
-#  $Header$
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/src/VTKViewer/VTKViewer_OpenGLRenderer.h b/src/VTKViewer/VTKViewer_OpenGLRenderer.h
index 83bcc5ecc4fbe99b33d7c174d3c280ee743c2fd1..20e6d5f92e4c289ea8ed8bdd1d14762abf1d6ae5 100644 (file)
--- a/src/VTKViewer/VTKViewer_OpenGLRenderer.h
+++ b/src/VTKViewer/VTKViewer_OpenGLRenderer.h
@@ -20,13 +20,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-
 #ifndef VTKVIEWER_OPENGLRENDERER_H
 #define VTKVIEWER_OPENGLRENDERER_H
 

diff --git a/src/VTKViewer/VTKViewer_Texture.h b/src/VTKViewer/VTKViewer_Texture.h
index b17028a347105648b6d6cfcc73828f7977acaa0b..ccd07888b1a19fc2243bb1e0ebc8182180b25680 100644 (file)
--- a/src/VTKViewer/VTKViewer_Texture.h
+++ b/src/VTKViewer/VTKViewer_Texture.h
@@ -20,13 +20,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-
 #ifndef VTKVIEWER_TEXTURE_H
 #define VTKVIEWER_TEXTURE_H