diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-10-12 09:03:16 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-10-12 09:03:16 -0400 |
| commit | a1c95f98b5190af307abd4cb945a2ae7d88796f2 (patch) | |
| tree | 14fa795d45d2f9ca2e9dc444a098b0155e94ac41 /COPYRIGHT | |
| parent | debian changelog, upstream version change & date (diff) | |
| parent | For the Win, Cory Doctorow, headings for scenes: numbering after name & witho... (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'COPYRIGHT')
| -rw-r--r-- | COPYRIGHT | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -128,6 +128,14 @@ Copyright: Cory Doctorow, 2008 License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0 URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/> +Text: Down and Out in the Magic Kingdom + URL: <http://craphound.com/down> +Author: Cory Doctorow + URL: <http://craphound.com> +Copyright: Cory Doctorow, 2003 +License: Attribution-NonCommercial-ShareAlike (CC-BY-NC-SA) 1.0 + URL: <http://creativecommons.org/licenses/by-nc-sa/1.0/> + Text: Little Brother URL: <http://craphound.com/littlebrother> Author: Cory Doctorow @@ -136,6 +144,14 @@ Copyright: Cory Doctorow, 2008 License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0 URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/> +Text: For the Win + URL: <http://craphound.com/ftw> +Author: Cory Doctorow + URL: <http://craphound.com> +Copyright: Cory Doctorow, 2010 +License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0 + URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/> + Text: Accelerando URL: <http://www.accelerando.org/> Author: Charles Stross |