diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-30 20:06:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-30 20:08:01 -0400 |
| commit | 8f4fdb3f9782fd39e48cb0a6d3e82866b9b1a976 (patch) | |
| tree | 12bd96c3d3b47b203f0fac44977a558b183cb13a /git-annex.cabal | |
| parent | 5287d1dc3f293b6eb7f6759fe9f25be1ad85fbae (diff) | |
| parent | 85f1f3a63a025204e931959ec9c5ae2a7812ddff (diff) | |
Merge branch 'new-monad-control'
Conflicts:
debian/changelog
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index ae6a129b3..a0980b1f0 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -30,8 +30,8 @@ Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, unix, containers, utf8-string, network, mtl, bytestring, old-locale, time, - pcre-light, extensible-exceptions, dataenc, SHA, process, hS3, HTTP, - base < 5, monad-control < 0.3, json + pcre-light, extensible-exceptions, dataenc, SHA, process, hS3, json, HTTP, + base < 5, monad-control, transformers-base, lifted-base Executable git-annex-shell Main-Is: git-annex-shell.hs |