summaryrefslogtreecommitdiff
path: root/LICENCE
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-01 19:45:20 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-01 19:45:20 +0100
commit269e98c93f1bff77dc33701f1e5e8615a031ec0b (patch)
treed6e35e6da4bc19f657ac07ff8447ec065d85a4aa /LICENCE
parentd1b6ea47f57cbcac8543a4dba976e13e3bc2e985 (diff)
parent2a8b0c42a074556bd489ef88a2b788f84ff6cf1e (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'LICENCE')
-rw-r--r--LICENCE16
1 files changed, 4 insertions, 12 deletions
diff --git a/LICENCE b/LICENCE
index 869eaaf63..89ce093f4 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,20 +17,14 @@ 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
• uClibc Buildroot
• The MirOS Project and contributors
-
-────────────────────────────────────────────────────────────────────────