Skip to content

Commit 8c9ca72

Browse files
slightly re-word the license.
1 parent a901624 commit 8c9ca72

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

LICENSE

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2023 Stefan Haustein and Aaron Liu
1+
Copyright (c) 2024 Stefan Haustein and Aaron Liu
22

33
This program is free software: you may copy, redistribute and/or modify it
44
under the terms of (at your option) either the Apache License, Version 2.0,
@@ -10,5 +10,10 @@ WITHOUT ANY WARRANTY; without even the implied warranty of
1010
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1111

1212
For details, see either
13-
<https://www.apache.org/licenses/LICENSE-20> for the Apache License, Version 2.0
14-
, or <https://www.gnu.org/licenses/gpl-3.0.en.html> for the GNU GPL, version 3.
13+
<https://www.apache.org/licenses/LICENSE-20> for the Apache License, Version 2.0,
14+
or <https://www.gnu.org/licenses/gpl-3.0.en.html> for the GNU GPL, version 3.
15+
16+
Note that the code contained in this package contains the CImg library,
17+
which is licensed under either [CeCILL 2.0](https://spdx.org/licenses/CECILL-2.0.html)
18+
(close to GPL and compatible with it) or [CeCILL-C](https://spdx.org/licenses/CECILL-C)
19+
(close to LGPL and compatible with Apache).

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@ For the example below, the top image was generated with the character optimizati
9393

9494
## Licensing
9595

96-
You are free to use this code under either the GPL (3 or later) or the Apache 2.0. We also use the CImg library, which is licensed under either [CeCILL 2.0](https://spdx.org/licenses/CECILL-2.0.html) (close to GPL and compatible with it) or [CeCILL-C](https://spdx.org/licenses/CECILL-C) (close to LGPL and compatible with Apache).
96+
You are free to use this code under either the GPL (3 or later) or version 2.0 of the Apache license. We include the CImg library, which
97+
is licensed under either [CeCILL 2.0](https://spdx.org/licenses/CECILL-2.0.html) (close to GPL and compatible with it) or [CeCILL-C] (https://spdx.org/licenses/CECILL-C) (close to LGPL and compatible with Apache).

0 commit comments

Comments
 (0)