summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-06 13:03:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-06 13:03:23 -0400
commit0e976c0f1450cdf3b86e72188707cac3bc88e27d (patch)
tree8b2f5de5735e259f1a1332c9c954b51c9e414d34 /debian
parent4a79d9434a5dee771376e1fdc77c3ddf1c99e99d (diff)
fix merge
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
1 files changed, 0 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index a99b57424..740773fd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,18 +8,6 @@ git-annex (5.20131102) UNRELEASED; urgency=low
git annex upgrade
* The -c option now not only modifies the git configuration seen by
git-annex, but it is passed along to every git command git-annex runs.
- * Improve local pairing behavior when two computers both try to start
- the pairing process separately.
- * sync: Work even when the local git repository is new and empty,
- with no master branch.
- * gcrypt, bup: Fix bug that prevented using these special remotes
- with encryption=pubkey.
- * Fix enabling of gcrypt repository accessed over ssh;
- git-annex-shell gcryptsetup had a bug that caused it to fail
- with permission denied.
- * Fix zombie process that occurred when switching between repository
- views in the webapp.
- * map: Work when there are gcrypt remotes.
-- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400