diff options
| author | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
| commit | 4558457402a4ab6bc795589a2e400fa66144f76e (patch) | |
| tree | 8368320617a8febc3c9c9708f688b6591801f4c0 /debian/copyright | |
| parent | 9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff) | |
| parent | 2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff) | |
| download | ikiwiki-4558457402a4ab6bc795589a2e400fa66144f76e.tar ikiwiki-4558457402a4ab6bc795589a2e400fa66144f76e.tar.gz | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/copyright b/debian/copyright index 1e2a27349..bcd2c1a47 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,6 +32,16 @@ Files: tla.pm Copyright: © 2006 Clint Adams <schizo@debian.org> License: GPL-2+ +Files: darcs.pm +Copyright: + © 2006 Thomas Schwinge <tschwinge@gnu.org> + 2007 Benjamin A'Lee <bma@bmalee.eu> + Tuomo Valkonen <tuomov@iki.fi> + 2008 Simon Michael <simon@joyful.com> + Petr Ročkai <me@mornfall.net> + Sven M. Hallberg <pesco@khjk.org> +License: GPL-2+ + Files: teximg.pm Copyright: © 2007 Patrick Winnertz <patrick.winnertz@skolelinux.org> License: GPL-2+ |