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 /git-annex.cabal | |
| parent | b48d7747a3ac8bea7d58e8fff8faf791f98699c0 (diff) | |
| parent | 898611ce5af106da840e5cebb3ed0e81a77ee184 (diff) | |
Merge branch 'master' into assistant
Conflicts:
git-annex.cabal
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 be752f844..2e312d4c3 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120630 +Version: 3.20120721 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |