diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-09 14:03:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-09 14:03:40 -0400 |
| commit | 2e1f3a86aec44337775b418b66bf9696146a49f2 (patch) | |
| tree | 6f80c1a75e06ffcaeefe4225fa45d18719a03667 /git-annex.cabal | |
| parent | be310ac4d0d0c0343c8a7d54f9137ee1946bfd1c (diff) | |
| parent | cb552f4a443d9b89b6265c66b1e3ddda106ef4f8 (diff) | |
Merge branch 'master' into assistant
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 cdac47bc7..9defcb223 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120722 +Version: 3.20120807 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |