+2021-06-04 Bruno Haible <bruno@clisp.org>
+
+ git-merge-changelog: Fix license.
+ * modules/git-merge-changelog (License): Change back to GPL.
+ * lib/git-merge-changelog.c: Use a GPLv3+ notice.
+
2021-06-04 Bruno Haible <bruno@clisp.org>
Put GPLv3+ notices in source files where appropriate.
/* git-merge-changelog - git "merge" driver for GNU style ChangeLog files.
Copyright (C) 2008-2021 Bruno Haible <bruno@clisp.org>
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This file is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3 of the License,
+ or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.