From 729661821620f8c7e349d8dd10f3765418b6151b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Mar 2013 09:49:52 -0400 Subject: Added remote..annex-gnupg-options setting. Thanks, guilhem for the patch. --- debian/changelog | 2 ++ debian/copyright | 11 ++++++++++- doc/todo/wishlist:_GnuPG_options.mdwn | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cac59c1f..f8ff2d282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,8 @@ git-annex (4.20130228) UNRELEASED; urgency=low * addurl: Properly handle url-escaped characters in file:// urls. * status: Can now be run with a directory path to show only the status of that directory, rather than the whole annex. + * Added remote..annex-gnupg-options setting. + Thanks, guilhem for the patch. -- Joey Hess Wed, 27 Feb 2013 23:20:40 -0400 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 License: GPL-3+ Files: Assistant/WebApp.hs Assistant/WebApp/* templates/* static/* -Copyright: © 2012 Joey Hess +Copyright: © 2012-2013 Joey Hess License: AGPL-3+ +Files: Utility/ThreadScheduler.hs +Copyright: 2011 Bas van Dijk & Roel van Dijk + 2012 Joey Hess +License: GPL-3+ + +Files: Utility/Gpg/Types.hs +Copyright: 2013 guilhem +License: GPL-3+ + Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns Copyright: 2007 Henrik Nyh 2010 Joey Hess diff --git a/doc/todo/wishlist:_GnuPG_options.mdwn b/doc/todo/wishlist:_GnuPG_options.mdwn index fb77a54ff..2cadf8213 100644 --- a/doc/todo/wishlist:_GnuPG_options.mdwn +++ b/doc/todo/wishlist:_GnuPG_options.mdwn @@ -12,3 +12,5 @@ And compression could be enabled on say, text files, with a suitable wildcard in This is something I could probably hack on if you think it'd be a worthwhile option ;-) + +> Done, and [[done]]! --[[Joey]] -- cgit v1.2.3