diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
| commit | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (patch) | |
| tree | 08705fab60c11d4073734a8c2500a88b1aab7852 /git-annex.cabal | |
| parent | 3e55a8f164d67d5bd1ef86ae2f38fb2c6c3a51b2 (diff) | |
| parent | 94554782894ec6c26da3b46312d5d1d16d596458 (diff) | |
Merge branch 'master' into desymlink
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
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 6f06d8581..67b7658d7 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20121128 +Version: 3.20121211 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |