summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-15 19:36:48 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-15 19:36:48 -0400
commit1f7f5d5e0e21920c5f15290cd34594ad91077071 (patch)
treea19302c57ed6ea46c4bf05a1ed8d840725643069 /debian/copyright
parent917f54a777d152ee5963acd81bf8a2800a0507b1 (diff)
parent20e691fe20ead76d826ab77501c6e9cbc7b487e8 (diff)
Merge branch 'master' into darcs
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/copyright b/debian/copyright
index 87f3cac89..f257234dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -104,6 +104,10 @@ Files: color.pm
Copyright: Copyright (C) 2008 Paweł Tęcza <ptecza@net.icm.edu.pl>
License: GPL-2+
+Files: google.pm
+Copyright: Copyright (C) 2008 Peter Simons <simons@cryp.to>
+License: GPL-2+
+
Files: doc/logo/*
Copyright: © 2006 Recai Oktaş <roktas@debian.org>
License: GPL-2+