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 remote-tracking branch 'origin/master' into gni/adaptation
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
SMESH_StdMeshersGUI.hxx
diff --git
a/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
b/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
old mode 100755
(executable)
new mode 100644
(file)
index
3fe783b
..
c44ff69
--- a/
src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
+++ b/
src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,7
+26,7
@@
#ifndef SMESH_STDMESHERSGUI_HXX
#define SMESH_STDMESHERSGUI_HXX
#ifndef SMESH_STDMESHERSGUI_HXX
#define SMESH_STDMESHERSGUI_HXX
-#ifdef W
NT
+#ifdef W
IN32
#if defined STDMESHERSGUI_EXPORTS || defined StdMeshersGUI_EXPORTS
#define STDMESHERSGUI_EXPORT __declspec( dllexport )
#else
#if defined STDMESHERSGUI_EXPORTS || defined StdMeshersGUI_EXPORTS
#define STDMESHERSGUI_EXPORT __declspec( dllexport )
#else