summaryrefslogtreecommitdiff
path: root/License
diff options
context:
space:
mode:
authorrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2006-05-28 08:17:56 +0000
committerrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2006-05-28 08:17:56 +0000
commit6a9c8cc298ba93f21ad9f575e82b62a63c0cf2b5 (patch)
tree0462d3ee9040854cbdb6c7bc6c1a5a6360174287 /License
parent3e817888c0b30e37a5a5c5d5e8a614b9019eb99f (diff)
downloadfreertos-6a9c8cc298ba93f21ad9f575e82b62a63c0cf2b5.tar.gz
freertos-6a9c8cc298ba93f21ad9f575e82b62a63c0cf2b5.tar.bz2
freertos-6a9c8cc298ba93f21ad9f575e82b62a63c0cf2b5.tar.xz
git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@12 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
Diffstat (limited to 'License')
-rw-r--r--License/license.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/License/license.txt b/License/license.txt
index d846b800..41a77abc 100644
--- a/License/license.txt
+++ b/License/license.txt
@@ -1,7 +1,7 @@
-The FreeRTOS source code is licensed by the modified GNU General Public
+The FreeRTOS.org source code is licensed by the modified GNU General Public
License (GPL) text provided below. The FreeRTOS download also includes
demo application source code, some of which is provided by third parties
-AND IS LICENSED SEPARATELY FROM FREERTOS.
+AND IS LICENSED SEPARATELY FROM FREERTOS.ORG.
For the avoidance of any doubt refer to the comment included at the top
of each source and header file for license and copyright information.
@@ -33,6 +33,9 @@ and are NOT COVERED BY THE GPL.
conditions stated at the top of the human readable files are understood
and adhered at all times for all files in that directory.
+5) The files contained within FreeRTOS\Demo\WizNET_DEMO_TERN_186\tern_code,
+ which are slightly modified versions of code provided by and copyright to
+ Tern Inc.
Errors and omissions should be reported to Richard Barry, contact details for
whom can be obtained from http://www.FreeRTOS.org.