diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-14 15:35:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-14 15:35:15 -0400 |
| commit | 513b3a639796b06828570b6da6b049095abd5b83 (patch) | |
| tree | adc204e55854d1d5d4f75689ea17fa9624142872 /git-annex.cabal | |
| parent | cd4304b64943ba55ffc8beac47796affc5405fd8 (diff) | |
| parent | 1029cba6ac006b34053f3f96cbee9ecafe8cc1ae (diff) | |
Merge branch 'master' into concurrentprogress
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 e0643e815..3c1af0df2 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -104,7 +104,7 @@ Flag network-uri Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, - containers, utf8-string, mtl (>= 2), + containers (>= 0.5.0.0), utf8-string, mtl (>= 2), bytestring, old-locale, time, dataenc, SHA, process, json, base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, |