diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
| commit | ae474d8e14631ff519ed7d54bb64eaa0538f56d9 (patch) | |
| tree | 09637db5faf2632b67b581cf04463fe4493584d4 /debian/copyright | |
| parent | 0314ed459ba1c49fad9170a54cc05f1c9e9c96bf (diff) | |
| parent | 08e4472fc469c630ebef93e16a66a5a69d9cb33a (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright index c5993edb2..0299d8a77 100644 --- a/debian/copyright +++ b/debian/copyright @@ -76,7 +76,7 @@ Files: htmltidy.pm Copyright: © 2006 Faidon Liambotis License: GPL-2+ -Files: htmlbalance.pm +Files: htmlbalance.pm, underlay.pm Copyright: © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/> License: GPL-2+ @@ -122,6 +122,10 @@ Files: po.pm Copyright: © 2008-2009 intrigeri <intrigeri@boum.org> License: GPL-2+ +Files: 404.pm +Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/> +License: GPL-2+ + Files: doc/logo/* Copyright: © 2006 Recai Oktaş <roktas@debian.org> License: GPL-2+ |