aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-03-23 20:01:16 -0400
committerRalph Amissah <ralph@amissah.com>2010-03-23 20:01:16 -0400
commit96d10118de0968d1407a0899930be65d4f5dc25e (patch)
treef0a84e9d8b2b348c47c512d3abad1ff08d4d13b8 /COPYRIGHT
parentdebian introducing version 2, containing v1 & v2 samples (diff)
parentchangelog, copyright (added data) (2.0.1) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT8
1 files changed, 8 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 1d61838..73fe526 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -104,6 +104,14 @@ Copyright: Eric S Raymond, 2000
License: Open Publication License, v 2.0
URL:
+Text: CONTENT - Selected Essays on Technology, Creativity, Copyright and the Future of the Future
+ URL: <http://craphound.com/content>
+Author: Cory Doctorow
+ URL: <http://craphound.com>
+Copyright: Cory Doctorow, 2008
+License:
+ URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+
Text: Little Brother
URL: <http://craphound.com/littlebrother>
Author: Cory Doctorow