aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-06 12:29:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-06 12:29:11 -0400
commit1e70dbeba726f0cf3bd7f9fe66b4494bd61be1d9 (patch)
tree1eaf1ce3b7486e1fd30d0c183acf0559b1138162
parent4e05308976c3894f4010e6111e1e760abe4a212a (diff)
prep release5.20140306
-rw-r--r--debian/changelog4
-rw-r--r--git-annex.cabal2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 80b310de2..5ab2f2446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-git-annex (5.20140228) UNRELEASED; urgency=medium
+git-annex (5.20140306) unstable; urgency=high
* sync: Fix bug in direct mode that caused a file that was not
checked into git to be deleted when there was a conflicting
@@ -33,7 +33,7 @@ git-annex (5.20140228) UNRELEASED; urgency=medium
* assistant: Smarter log file rotation, which takes free disk space
into account.
- -- Joey Hess <joeyh@debian.org> Fri, 28 Feb 2014 14:52:15 -0400
+ -- Joey Hess <joeyh@debian.org> Thu, 06 Mar 2014 12:28:04 -0400
git-annex (5.20140227) unstable; urgency=medium
diff --git a/git-annex.cabal b/git-annex.cabal
index cafd22570..2f3b7a2eb 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 5.20140227
+Version: 5.20140306
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>