From 3957248bcc1734eb36eec73660f9dc43c505224f Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 20 Dec 2012 16:01:07 +0000
Subject: [PATCH] Remove redundant $Header from files (to minimize conflicts
 during merges)

---
 bin/Makefile.am                          | 1 -
 build_configure                          | 3 +--
 doc/Makefile.am                          | 1 -
 doc/salome/Makefile.am                   | 1 -
 resources/Makefile.am                    | 1 -
 src/CAF/Makefile.am                      | 1 -
 src/CAM/Makefile.am                      | 1 -
 src/DDS/Makefile.am                      | 1 -
 src/Event/Makefile.am                    | 1 -
 src/GLViewer/Makefile.am                 | 1 -
 src/LightApp/Makefile.am                 | 1 -
 src/LogWindow/Makefile.am                | 1 -
 src/ObjBrowser/Makefile.am               | 1 -
 src/OpenGLUtils/Makefile.am              | 1 -
 src/Plot2d/Makefile.am                   | 1 -
 src/PyConsole/Makefile.am                | 1 -
 src/QDS/Makefile.am                      | 1 -
 src/Qtx/Makefile.am                      | 1 -
 src/SALOME_PY/Makefile.am                | 1 -
 src/SALOME_PYQT/Makefile.am              | 1 -
 src/SALOME_SWIG/Makefile.am              | 1 -
 src/SOCC/Makefile.am                     | 1 -
 src/STD/Makefile.am                      | 1 -
 src/SUITApp/Makefile.am                  | 1 -
 src/SalomeApp/Makefile.am                | 1 -
 src/Session/Makefile.am                  | 1 -
 src/TOOLSGUI/Makefile.am                 | 1 -
 src/VTKViewer/VTKViewer_OpenGLRenderer.h | 7 -------
 src/VTKViewer/VTKViewer_Texture.h        | 7 -------
 29 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 3d62fcb8a..fa76ead8a 100644
--- 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 dfdad322f..269aa907c 100755
--- 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 6fd352bfe..a1f146a09 100644
--- 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 1cdadbb48..d32ff456b 100644
--- 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 9f4e08508..b3d3a85a1 100644
--- 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 9206827b0..cd88e2c27 100755
--- 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 4359790fb..b6ee16ad1 100755
--- 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 c3b333fc9..705e9857f 100755
--- 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 612abc06d..bc2a4f2a8 100755
--- 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 7ac304a93..e1dece750 100644
--- 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 9c3029a9c..4edeb9bf4 100755
--- 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 f0c0ee556..6abb2b87a 100755
--- 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 7c96eb399..0bb77d827 100755
--- 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 665488d41..78ca6877e 100755
--- 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 f806f9b6f..026e25009 100755
--- 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 5cddb3f74..1b2807496 100755
--- 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 8fe75f877..d926b2fb6 100755
--- 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 ec99c79c7..0833d5aa5 100755
--- 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 c4b48bd48..a9292e6b3 100755
--- 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 f7ec51cb2..f90b383f9 100755
--- 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 54e492d6e..ffb16b082 100755
--- 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 6de12512a..f4e131036 100755
--- 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 b376e7536..ad81db1af 100755
--- 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 d4dda8551..52f34ff44 100644
--- 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 9ed873df7..6321634e6 100755
--- 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 26a25db0c..4b0fb92ea 100755
--- 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 690f731d3..200e55c61 100755
--- 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 83bcc5ecc..20e6d5f92 100644
--- 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 b17028a34..ccd07888b 100644
--- 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
 
-- 
2.39.2