diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-12 13:37:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-12 13:37:17 -0400 |
| commit | 2e5ea30981251fbdce38e18f3521917742c892a3 (patch) | |
| tree | d7c94a33061949007dada9d7cda5b0b748a4e8b4 /git-annex.cabal | |
| parent | 942d8f72984377c4e69d7c55877621d434e5d687 (diff) | |
| parent | 4ebb0b51d77484fcee12fd92a71b737b1aaca283 (diff) | |
Merge branch 'master' into watch
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 5f94392f5..7556f7541 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -7,7 +7,6 @@ Author: Joey Hess Stability: Stable Copyright: 2010-2012 Joey Hess License-File: GPL -Extra-Source-Files: use-make-sdist-instead Homepage: http://git-annex.branchable.com/ Build-type: Custom Category: Utility @@ -37,6 +36,7 @@ Executable git-annex base == 4.5.*, monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, hinotify, STM + -- Need to list this because it's generated from a .hsc file. Other-Modules: Utility.Touch C-Sources: Utility/libdiskfree.c Extensions: CPP @@ -54,6 +54,7 @@ Test-Suite test base == 4.5.*, monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, hinotify, STM + Other-Modules: Utility.Touch C-Sources: Utility/libdiskfree.c Extensions: CPP |