Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 01/04/2013
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESH_Controls.hxx
diff --git
a/src/SMESHDS/SMESH_Controls.hxx
b/src/SMESHDS/SMESH_Controls.hxx
index 49d6ab1d24e639468d091f7c980ea803ec6747e6..70dd6a6cb4c2ee19b02ba1bd1e928f901aa25b6b 100644
(file)
--- a/
src/SMESHDS/SMESH_Controls.hxx
+++ b/
src/SMESHDS/SMESH_Controls.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-23,6
+23,9
@@
#ifndef _SMESH_CONTROLS_HXX_
#define _SMESH_CONTROLS_HXX_
#ifndef _SMESH_CONTROLS_HXX_
#define _SMESH_CONTROLS_HXX_
+// This file is named incosistently with others, i.e. not SMESHDS_Controls.hxx,
+// because it was moved from ../Controls/SMESH_Controls.hxx
+
#include "SMDSAbs_ElementType.hxx"
#include <boost/shared_ptr.hpp>
#include "SMDSAbs_ElementType.hxx"
#include <boost/shared_ptr.hpp>