Merge branch 'readme-licensing' into 'master'

docs: Update license information in README and meson.build

See merge request pwithnall/malcontent!42
This commit is contained in:
Philip Withnall 2020-03-10 14:16:01 +00:00
commit e9c2f3d054
2 changed files with 4 additions and 2 deletions

View File

@ -101,7 +101,9 @@ Dependencies
Licensing
---------
All code in this project is licensed under LGPL-2.1+. See COPYING for more details.
All code in the libraries in this project is licensed under LGPL-2.1+. Code in the
`malcontent-control` application is licensed under GPL-2.0+. See `COPYING` and the
copyright headers in individual files for more details.
Bugs
----

View File

@ -1,7 +1,7 @@
project('malcontent', 'c',
version : '0.6.0',
meson_version : '>= 0.49.0',
license: 'LGPLv2.1+',
license: ['LGPL-2.1-or-later', 'GPL-2.0-or-later'],
default_options : [
'buildtype=debugoptimized',
'warning_level=2',