summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-29 14:03:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-29 14:03:03 -0400
commit61786c52ad128fe39346241ef47e50ac41afb774 (patch)
treee42799803d92f1d2e4ebd37cb2749718b50d23b1
parent26208b93e57df2cc314cbad7ad30a712b81e5dca (diff)
releasing version 3.201206293.20120629
-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 46afb6e4d..96d85da27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-git-annex (3.20120625) UNRELEASED; urgency=low
+git-annex (3.20120629) unstable; urgency=low
* cabal: Only try to use inotify on Linux.
* Version build dependency on STM, and allow building without it,
@@ -11,7 +11,7 @@ git-annex (3.20120625) UNRELEASED; urgency=low
in their names.
* sync: Automatically resolves merge conflicts.
- -- Joey Hess <joeyh@debian.org> Mon, 25 Jun 2012 11:38:12 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 29 Jun 2012 10:17:49 -0400
git-annex (3.20120624) unstable; urgency=low
diff --git a/git-annex.cabal b/git-annex.cabal
index f55940695..0bd35e14f 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 3.20120625
+Version: 3.20120629
Cabal-Version: >= 1.8
License: GPL
Maintainer: Joey Hess <joey@kitenet.net>