diff options
| author | Colin Walters <walters@verbum.org> | 2009-07-13 13:11:20 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-07-14 15:42:05 -0400 |
| commit | a96f2615c7f9c40aed54a71afea9ca57cdd26ad6 (patch) | |
| tree | 3bad95f645d09d8bd247ceb20b7284d07bfbb015 | |
| parent | 87ddff6b24d9b9d4bba225c33890db25022d8cbe (diff) | |
Bug 22415 - COYPING file should note we allow later versions of GPL
The canonical copyright information in the source file says we
allow later versions of the GPL. So note that in COPYING too.
(cherry picked from commit f908daed82d61df44710a8ec681558c6d23b940d)
| -rw-r--r-- | COPYING | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,12 +1,13 @@ D-Bus is licensed to you under your choice of the Academic Free -License version 2.1, or the GNU General Public License version 2. +License version 2.1, or the GNU General Public License version 2 +(or, at your option any later version). + Both licenses are included here. Some of the standalone binaries are under the GPL only; in particular, but not limited to, tools/dbus-cleanup-sockets.c and test/decode-gcov.c. Each source code file is marked with the proper copyright information - if you find a file that isn't marked please bring it to our attention. - The Academic Free License v. 2.1 |