summaryrefslogtreecommitdiff
path: root/LICENCE
diff options
context:
space:
mode:
authorwaldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>2010-01-20 21:31:30 +0100
committerwaldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>2010-01-20 21:31:30 +0100
commit19d0a5966d6841b6ff262e5928b593b0a1d77fff (patch)
tree3544a8beffbb1e3ce4acccd72e54d89654afb981 /LICENCE
parent68bb17312be33ae09255737dde26a93663cfc2ba (diff)
parentabed4c14e716e4870e6f5c38ea7f69bd7fe9bead (diff)
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'LICENCE')
-rw-r--r--LICENCE14
1 files changed, 4 insertions, 10 deletions
diff --git a/LICENCE b/LICENCE
index 869eaaf63..8d6c371b1 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,6 +1,4 @@
-$Id$
-
-OpenADK is Copyright © 2008 Waldemar Brodkorb
+OpenADK is Copyright © 2008-2010 Waldemar Brodkorb <wbx@openadk.org>
All rights reserved.
This licence file covers all of the OpenADK meta distribution
@@ -19,16 +17,12 @@ by the GNU General Public License, Version 2 or later, as shown
in the file COPYING in this directory. Individual files may be
covered by the LGPL or BSD-style licences instead. OpenADK also
contains tools that are possibly covered by non-GPL-compatible,
-but OSD/DFSG-compliant, licences. Specifically, some of these
-components may require acknowledgements to be displayed in the
-advertising materials; these are listed here:
-‣ This product includes material provided by Thorsten Glaser.
+but OSD/DFSG-compliant, licences.
OpenADK is based upon several other projects which are listed
below, in no particular order. If you think you should be li-
-sted here but we have forgotten you, please forgive and drop
-us an email.
-
+sted here but I have forgotten you, please forgive and drop
+me an email.
• The FreeWRT Project
• The OpenWrt Project