commit c20967701abee470588e112f15e592d9e09ce7a6
parent b7c5fb41045859eea417ae05c81cc6c36ad34711
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 21 Feb 2020 16:10:49 +0100
Merge branch 'release_0.4' into develop
Diffstat:
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
@@ -22,10 +22,17 @@ generate the 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.4
+
+- Bump the version of the AW dependency to 2.0:.uUdate the code to handle the
+ API breaks introduce by this update.
+
## License
-Star-3DAW is Copyright (C) |Meso|Star> 2015-2016 (<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, 2016, 2020 |Meso|Star> (<contact@meso-star.com>). Star-3DAW
+is free software released under the 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-2016 (contact@meso-star.com)
+# Copyright (C) 2015, 2016, 2020 |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,
@@ -56,8 +56,8 @@ include(rcmake_runtime)
# Configure and define targets
################################################################################
set(VERSION_MAJOR 0)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 1)
+set(VERSION_MINOR 4)
+set(VERSION_PATCH 0)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(S3DAW_FILES_SRC s3daw.c)
diff --git a/src/s3daw.c b/src/s3daw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2015-2016 (contact@meso-star.com)
+/* Copyright (C) 2015, 2016, 2020 |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/s3daw.h b/src/s3daw.h
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2015-2016 (contact@meso-star.com)
+/* Copyright (C) 2015, 2016, 2020 |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_s3daw.c b/src/test_s3daw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) |Meso|Star> 2015-2016 (contact@meso-star.com)
+/* Copyright (C) 2015, 2016, 2020 |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,