diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-22 14:12:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-22 14:12:42 -0400 |
| commit | d99f98187fc2cb79e879dcc5047fcf31fd934782 (patch) | |
| tree | edd5563f5efe83a9ce6a8bb515c6e9b1379b8319 /git-annex.cabal | |
| parent | 6173c44d0738ca8c9381189a819edecf1d39df3d (diff) | |
| parent | d6e7d47a6b8c853e68bf73586a7d5f451760737c (diff) | |
Merge branch 'master' into database
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 75e483b84..7f2c50b80 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20150205 +Version: 5.20150219 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <id@joeyh.name> |