diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-11 12:13:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-11 12:13:07 -0400 |
| commit | a5a3cd55ac2bab656824e48d29ead8382c583b01 (patch) | |
| tree | 1d5503b35e7fdb27bcd2e1e3f8f1020686882125 /git-annex.cabal | |
| parent | 433ff41496b073c71e465af8b38b2ecafe27d8dd (diff) | |
| parent | 5642e189b76070b43a8e24f9f49d36b950f83c8d (diff) | |
Merge branch 'master' into watch
Conflicts:
debian/changelog
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index e1ad16453..3459eaae0 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120605 +Version: 3.20120611 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |