diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-10 17:07:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-10 17:07:54 -0400 |
| commit | 0e1dfc32af1e8b0d40798cda650af168ca4290d0 (patch) | |
| tree | e8b0c9f3728b2452a19afe371c94d8192b838c33 /git-annex.cabal | |
| parent | 44956f3f6c58b253c188ce12a170a30dbdc06fe1 (diff) | |
| parent | 0b0d169c9011500a6e1dd44f5712d7bdca1992b1 (diff) | |
Merge branch 'master' into optparse-applicative
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 fec1bd40d..905b945ae 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20150617 +Version: 5.20150710 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <id@joeyh.name> |