diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-22 12:50:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-22 12:50:54 -0400 |
| commit | e4592649d68535ad45fe37449a90427e84734359 (patch) | |
| tree | 764d039de58b506a2c1f08a89e392be94ab06fe3 /debian | |
| parent | b48d7747a3ac8bea7d58e8fff8faf791f98699c0 (diff) | |
| parent | 898611ce5af106da840e5cebb3ed0e81a77ee184 (diff) | |
Merge branch 'master' into assistant
Conflicts:
git-annex.cabal
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f90763aca..387dacd53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-annex (3.20120630) UNRELEASED; urgency=low +git-annex (3.20120721) unstable; urgency=low * get, move, copy: Now refuse to do anything when the requested file transfer is already in progress by another process. @@ -13,7 +13,7 @@ git-annex (3.20120630) UNRELEASED; urgency=low .tar.gz Closes: #680450 * map: Write map.dot to .git/annex, which avoids watch trying to annex it. - -- Joey Hess <joeyh@debian.org> Sun, 01 Jul 2012 15:04:37 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 21 Jul 2012 16:52:48 -0400 git-annex (3.20120629) unstable; urgency=low |