Merge branch V7_3_1_BR

[modules/hexablock.git] / src / HEXABLOCKGUI / MyGEOMBase_Skeleton.hxx

diff --git a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
index 4544ee70526bfc90c8a29ef7f8ff653c61b647ab..a643f88399c9ca13e773db60820442586f976c46 100755 (executable)
--- a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
+++ b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2014  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,8 @@
 #ifndef MYGEOMBASE_SKELETON_H
 #define MYGEOMBASE_SKELETON_H
 
-
-#include "HEXABLOCKGUI_Export.hxx"
-
+#include "HEXABLOCKGUI_Export.hxx"\r
+\r
 #include "HEXABLOCKGUI_OccGraphicView.hxx"
 #include "HEXABLOCKGUI.hxx"
 #include "HEXABLOCKGUI_DocumentPanel.hxx"
@@ -44,8 +43,6 @@ class QPushButton;
 #  define DBL_DIGITS_DISPLAY 13
 #endif // COORD_MIN
 
-#include "hexa_base.hxx"
-
 namespace HEXABLOCK
 {
 namespace GUI