simono41/TerminalImageViewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

slightly re-word the license.

Browse source
This commit is contained in:
Stefan Haustein 2024-02-14 19:55:08 +01:00
parent a901624905
commit 8c9ca72902
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
LICENSE
View file

@ -1,4 +1,4 @@
Copyright (c) 2023 Stefan Haustein and Aaron Liu Copyright (c) 2024 Stefan Haustein and Aaron Liu
This program is free software: you may copy, redistribute and/or modify it This program is free software: you may copy, redistribute and/or modify it
under the terms of (at your option) either the Apache License, Version 2.0, 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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
For details, see either For details, see either
<https://www.apache.org/licenses/LICENSE-20> for the Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-20> for the Apache License, Version 2.0,
, or <https://www.gnu.org/licenses/gpl-3.0.en.html> for the GNU GPL, version 3. or <https://www.gnu.org/licenses/gpl-3.0.en.html> for the GNU GPL, version 3.
Note that the code contained in this package contains 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).

3
README.md
View file

@ -93,4 +93,5 @@ For the example below, the top image was generated with the character optimizati
## Licensing ## Licensing
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). 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
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).