commit 40c436547e33a0f9b9dcf742d180aba67aee8da3
parent 999e63811450290c85901e3437f225e9f8b6fc3d
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Mon, 19 Feb 2018 14:09:14 +0100
Merge branch 'release_0.2.2' into develop
Diffstat:
17 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+compile_commands.json
.gitignore
CMakeCache.txt
CMakeFiles
diff --git a/README.md b/README.md
@@ -55,6 +55,10 @@ for further informations on CMake).
## Release notes
+### Version 0.2.2
+
+- Bump the version of the dependencies and fix the code to handle their updates.
+
### Version 0.2.1
- Fix a crash that occurred in scenes having medium with a null absorption. In
@@ -72,7 +76,7 @@ for further informations on CMake).
Star-GF is developed by [|Meso|Star>](http://www.meso-star.com) for
[Électricité De France](http://researchers.edf.com/edf-researchers-209799.html)
-(EDF). It is Copyright (C) 2015-2016 EDF
+(EDF). It is Copyright (C) 2015-2018 EDF
S.A., France (<syrthes-support@edf.fr>). It is a free software released under
the [OSI](http://opensource.org)-approved GPL v3.0 license. You are welcome to
redistribute it under certain conditions; refer to the COPYING file for
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+# Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ include(rcmake_runtime)
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 2)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(SGF_FILES_SRC
diff --git a/src/sgf.h b/src/sgf.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_device.c b/src/sgf_device.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_device_c.h b/src/sgf_device_c.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_estimator.c b/src/sgf_estimator.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_realisation.h b/src/sgf_realisation.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_scene.c b/src/sgf_scene.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_scene_c.h b/src/sgf_scene_c.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_cube.c b/src/test_sgf_cube.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_device.c b/src/test_sgf_device.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_estimator.c b/src/test_sgf_estimator.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_scene.c b/src/test_sgf_scene.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_square.c b/src/test_sgf_square.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_tetrahedron.c b/src/test_sgf_tetrahedron.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_utils.h b/src/test_sgf_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by