diff options
author | David Waern <david.waern@gmail.com> | 2012-07-23 16:50:40 +0200 |
---|---|---|
committer | David Waern <david.waern@gmail.com> | 2012-07-23 16:50:40 +0200 |
commit | c3811c56988ecae6c3d3b2c4c202474de012e9ed (patch) | |
tree | c7d897e98c3523d056d38745b794c681b30a38f6 /haddock.cabal | |
parent | 83a2a6ab67b25eec42c50b99b0b594313b8abe44 (diff) | |
parent | 0730c1b4088fd5d2c36671b0adf3c9e11222e233 (diff) |
Merge branch 'dev' of https://github.com/sol/haddock into ghc-7.6
Conflicts:
src/Haddock/InterfaceFile.hs
Diffstat (limited to 'haddock.cabal')
-rw-r--r-- | haddock.cabal | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/haddock.cabal b/haddock.cabal index e133e51e..c9bad59a 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -104,8 +104,6 @@ executable haddock main-is: Main.hs hs-source-dirs: src - default-extensions: CPP, DeriveDataTypeable, - ScopedTypeVariables, MagicHash ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs other-modules: @@ -165,8 +163,6 @@ library build-depends: QuickCheck >= 2.1 && < 3 hs-source-dirs: src - default-extensions: CPP, DeriveDataTypeable, - ScopedTypeVariables, MagicHash ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs exposed-modules: |