summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2009-07-13 13:11:20 -0400
committerColin Walters <walters@verbum.org>2009-07-13 13:11:20 -0400
commitf908daed82d61df44710a8ec681558c6d23b940d (patch)
tree04b4013b4f6ca0fa13feb774c120d48ad2078f4c
parent0e36cdd54964c4012acec2bb8e598b85e82d2846 (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.
-rw-r--r--COPYING5
1 files changed, 3 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 73313765..8260b100 100644
--- a/COPYING
+++ b/COPYING
@@ -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