diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-20 12:44:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-20 12:44:25 -0400 |
| commit | 50d35a77f6ad083c6eead5439e9d0ca91ee03dc5 (patch) | |
| tree | 6021c5f39d2d6fe4a1ffe80e8d0895c2281ca210 /git-annex.cabal | |
| parent | 6f92da2474f66c0ffa3ee741383cb12cc462b61e (diff) | |
| parent | 244a312b17a8ba825507296f52ab9357220102c0 (diff) | |
Merge branch 'safesemaphore'
Conflicts:
debian/changelog
git-annex.cabal
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 5fb3944af..a2a89479b 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -50,7 +50,8 @@ Executable git-annex bytestring, old-locale, time, pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP, base (>= 4.5 && < 4.7), monad-control, transformers-base, lifted-base, - IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process + IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, + SafeSemaphore -- Need to list these because they're generated from .hsc files. Other-Modules: Utility.Touch Utility.Mounts Include-Dirs: Utility |