summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-16 11:37:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-16 11:37:28 -0400
commitde04f7153cfece4d9af10e84413872713881f286 (patch)
treeb878d5811b30c2df04ede5eb8d0ab6b3c69aa369
parent7d6329e5e4e4dd488b24e0002edcb2220073d8e9 (diff)
parent0b7047f7500734e7d6297f9e36f22873f323718d (diff)
Merge branch 'watch' of https://github.com/bgamari/git-annex into watch
-rw-r--r--git-annex.cabal4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index b02a9af4d..0fc4abaeb 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -35,7 +35,7 @@ Executable git-annex
pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
base == 4.5.*, monad-control, transformers-base, lifted-base,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance,
- hinotify, STM
+ hinotify, stm
-- Need to list this because it's generated from a .hsc file.
Other-Modules: Utility.Touch
C-Sources: Utility/libdiskfree.c
@@ -53,7 +53,7 @@ Test-Suite test
pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
base == 4.5.*, monad-control, transformers-base, lifted-base,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance,
- hinotify, STM
+ hinotify, stm
Other-Modules: Utility.Touch
C-Sources: Utility/libdiskfree.c
Extensions: CPP