summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-11 09:49:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-11 09:49:52 -0400
commit729661821620f8c7e349d8dd10f3765418b6151b (patch)
tree649d68443464be62ff4947a8142e6477774a03c2 /debian/copyright
parent7fa1e498de9cbb84b23f90b17c66d755292ae716 (diff)
Added remote.<name>.annex-gnupg-options setting. Thanks, guilhem for the patch.
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright11
1 files changed, 10 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright
index 17c928f81..1791a0492 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,18 @@ Copyright: © 2010-2013 Joey Hess <joey@kitenet.net>
License: GPL-3+
Files: Assistant/WebApp.hs Assistant/WebApp/* templates/* static/*
-Copyright: © 2012 Joey Hess <joey@kitenet.net>
+Copyright: © 2012-2013 Joey Hess <joey@kitenet.net>
License: AGPL-3+
+Files: Utility/ThreadScheduler.hs
+Copyright: 2011 Bas van Dijk & Roel van Dijk
+ 2012 Joey Hess <joey@kitenet.net>
+License: GPL-3+
+
+Files: Utility/Gpg/Types.hs
+Copyright: 2013 guilhem <guilhem@fripost.org>
+License: GPL-3+
+
Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns
Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
2010 Joey Hess <joey@kitenet.net>