Merge branch 'V7_3_1_BR'

diff --git a/FindGd.cmake b/FindGd.cmake
index 5f835906d18735eefcf7da941ae0f732728d9710..f28e402f69ad30a4f568f5507bd7115647a47983 100644 (file)
--- a/FindGd.cmake
+++ b/FindGd.cmake
@@ -6,12 +6,12 @@
 #
 
 #########################################################################
-# Copyright (C) 2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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

diff --git a/atomic_env_build.sh b/atomic_env_build.sh
index 4bad895c17d6748b087584250420ba57ceb23d6d..8a1eafe64686cb0e75dbbbd35ab38448f20505ea 100644 (file)
--- a/atomic_env_build.sh
+++ b/atomic_env_build.sh
@@ -1,9 +1,9 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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