commit 4985ac7f508829ccbf53930d0b87c1f63cc4a183
parent 84569f43e2704ff823d945a638723d49dfdef832
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 7 Oct 2021 11:06:10 +0200
Merge branch 'release_0.3.2' into develop
Diffstat:
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
@@ -21,10 +21,17 @@ project from the `cmake/CMakeLists.txt` file by appending to the
dependencies. The generated project can be edited, built, tested and installed
as any CMake project.
+## Release notes
+
+### Version 0.3.2
+
+Sets the CMake minimum version to 3.1: since CMake 3.20, version 2.8 has become
+obsolete.
+
## License
-Star-3DSTL is Copyright (C) |Meso|Star> 2015-2018 (<contact@meso-star.com>).
-It is a free software released under the [OSI](http://opensource.org)-approved
-CeCILL license. You are welcome to redistribute it under certain conditions;
-refer to the COPYING files for details.
+Copyright (C) 2015-2018, 2021 |Meso|Star> (<contact@meso-star.com>). Star-3DSTL is
+free software released under CeCILLv2.1 license. You are welcome to
+redistribute it under certain conditions; refer to the COPYING files for
+details.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) |Meso|Star> 2015-2018 (contact@meso-star.com)
+# Copyright (C) 2015-2018, 2021 |Meso|Star> (contact@meso-star.com)
#
# This software is governed by the CeCILL license under French law and
# abiding by the rules of distribution of free software. You can use,
@@ -65,7 +65,7 @@ target_link_libraries(s3dstl RSys Star3D StarSTL)
set(VERSION_MAJOR 0)
set(VERSION_MINOR 3)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set_target_properties(s3dstl PROPERTIES
DEFINE_SYMBOL S3DSTL_SHARED_BUILD
diff --git a/src/s3dstl.c b/src/s3dstl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2015-2018 (contact@meso-star.com)
+/* Copyright (C) 2015-2018, 2021 |Meso|Star> (contact@meso-star.com)
*
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
diff --git a/src/s3dstl.h b/src/s3dstl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2015-2018 (contact@meso-star.com)
+/* Copyright (C) 2015-2018, 2021 |Meso|Star> (contact@meso-star.com)
*
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
diff --git a/src/test_s3dstl.c b/src/test_s3dstl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2015-2018 (contact@meso-star.com)
+/* Copyright (C) 2015-2018, 2021 |Meso|Star> (contact@meso-star.com)
*
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,