Incrementation of OCCT version up to 6.8.0beta

Correction of license statements

diff --git a/src/GeomInt/GeomInt.cxx b/src/GeomInt/GeomInt.cxx
index 3b88d1ffe433ae1106ab5c5efa84918d3ec14905..ad6bb2b777631c7cf8858837371ae2a2d42c7157 100644 (file)
--- a/src/GeomInt/GeomInt.cxx
+++ b/src/GeomInt/GeomInt.cxx
@@ -1,7 +1,18 @@
-// File:      GeomInt.cxx
-// Created:   25.08.14 17:59:59
-// Author:    jgv@VIVEX
-// Copyright: Open CASCADE 2014
+
+// Created on:   25.08.14 17:59:59
+// Created by:    jgv@VIVEX
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 #include <GeomInt.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>

diff --git a/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx b/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx
index 4a1e4684e5c998be31115be5a70aa99a6fb41d63..4f17f8d7286e932fa442287662494665cc1262a9 100644 (file)
--- a/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx
+++ b/src/IVtkTools/IVtkTools_DisplayModeFilter.hxx
@@ -4,8 +4,8 @@
 // 
 // This file is part of Open CASCADE Technology software library.
 //
-// This library is free software; you can redistribute it and / or modify it
-// under the terms of the GNU Lesser General Public version 2.1 as published
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
 // by the Free Software Foundation, with special exception defined in the file
 // OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
 // distribution for complete text of the license and disclaimer of any warranty.

diff --git a/src/MeshVS/MeshVS_SymmetricPairHasher.hxx b/src/MeshVS/MeshVS_SymmetricPairHasher.hxx
index 8fd64227b1784ef3df511ee43452dc19793fcac8..e3abfbcc28c12eb61f6650ba2ed0b96dc5b8b374 100644 (file)
--- a/src/MeshVS/MeshVS_SymmetricPairHasher.hxx
+++ b/src/MeshVS/MeshVS_SymmetricPairHasher.hxx
@@ -1,3 +1,16 @@
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
 #ifndef _MeshVS_SymmetricPairHasher_HeaderFile
 #define _MeshVS_SymmetricPairHasher_HeaderFile
 

diff --git a/src/NCollection/NCollection_WinHeapAllocator.cxx b/src/NCollection/NCollection_WinHeapAllocator.cxx
index dde35c304b007c008662b501729bee2d8c0d9a87..12c9b00427b0bb846477eb169e966311fcf2ebf0 100644 (file)
--- a/src/NCollection/NCollection_WinHeapAllocator.cxx
+++ b/src/NCollection/NCollection_WinHeapAllocator.cxx
@@ -1,7 +1,17 @@
-// File:      NCollection_WinHeapAllocator.cxx
-// Created:   22.07.11
-// Author:    Kirill GAVRILOV
-// Copyright: Open Cascade 2011
+// Created on: 22.07.11
+// Created by: Kirill GAVRILOV
+// Copyright (c) 2002-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 #include <NCollection_WinHeapAllocator.hxx>
 #include <Standard_OutOfMemory.hxx>

diff --git a/src/NCollection/NCollection_WinHeapAllocator.hxx b/src/NCollection/NCollection_WinHeapAllocator.hxx
index 698a7d9e77f9fd6b543bda8c9aead78d77911272..54af69072713c1da67a0e3bd34a3b4006afcb782 100644 (file)
--- a/src/NCollection/NCollection_WinHeapAllocator.hxx
+++ b/src/NCollection/NCollection_WinHeapAllocator.hxx
@@ -1,7 +1,17 @@
-// File:      NCollection_WinHeapAllocator.hxx
-// Created:   22.07.11
-// Author:    Kirill GAVRILOV
-// Copyright: Open Cascade 2011
+// Created on: 2011-07-11
+// Created by: Kirill GAVRILOV
+// Copyright (c) 2002-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 #ifndef NCollection_WinHeapAllocator_HeaderFile
 #define NCollection_WinHeapAllocator_HeaderFile

diff --git a/src/Standard/Standard_Version.hxx b/src/Standard/Standard_Version.hxx
index 4c10e3d918b1e10236538678219737fe34feeedd..573d20f24084395b50c1875122bb12cdb2731dd8 100644 (file)
--- a/src/Standard/Standard_Version.hxx
+++ b/src/Standard/Standard_Version.hxx
@@ -42,7 +42,7 @@
 //! - "dev" for official (certified) version (master branch) between releases
 //! - "beta..." or "rc..." for beta releases or release candidates
 //! - "project..." for version containing project-specific fixes
-#define OCC_VERSION_DEVELOPMENT   "dev"
+#define OCC_VERSION_DEVELOPMENT   "beta"
 
 // Derived (manually): version as real and string (major.minor)
 #define OCC_VERSION               6.8