diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
| commit | 8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a (patch) | |
| tree | 9e26465e0ca98a5f3cbc6c72a0cace4bf83b93db /debian/copyright | |
| parent | 78a69e5bd632eb86ef8135e9c1d05d2c48b43362 (diff) | |
| parent | 08fda4c9d374de1d3de3172a192d4d915d3dc0c1 (diff) | |
Merge branch 'master'
Conflicts:
doc/ikiwiki-makerepo.mdwn
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/debian/copyright b/debian/copyright index f257234dd..67f0ac540 100644 --- a/debian/copyright +++ b/debian/copyright @@ -76,6 +76,10 @@ Files: htmltidy.pm Copyright: © 2006 Faidon Liambotis License: GPL-2+ +Files: htmlbalance.pm, underlay.pm +Copyright: © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/> +License: GPL-2+ + Files: polygen.pm, pagestats.pm, cutpaste.pm Copyright: © 2006 Enrico Zini License: GPL-2+ @@ -108,6 +112,20 @@ Files: google.pm Copyright: Copyright (C) 2008 Peter Simons <simons@cryp.to> License: GPL-2+ +Files: comments.pm +Copyright: + © 2006-2008 Joey Hess <joey@ikiwiki.info> + © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/> +License: GPL-2+ + +Files: 404.pm +Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/> +License: GPL-2+ + +Files: wmd.pm +Copyright: © 2009 William Uther +License: GPL-2+ + Files: doc/logo/* Copyright: © 2006 Recai Oktaş <roktas@debian.org> License: GPL-2+ |