diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-05-17 11:47:24 +0200 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-05-17 11:47:24 +0200 |
| commit | 962e8ab32ab62daaf92069bfec0e1de8384d7494 (patch) | |
| tree | 2bedb1cdffca2026776855b29244801333f399df /src | |
| parent | 778bb52b38e9695acd6f4f933218b5d5231221a8 (diff) | |
| parent | 84b5b16108e73d79c882f1e5ff7bebd7fa85c5ac (diff) | |
| download | hakyll-962e8ab32ab62daaf92069bfec0e1de8384d7494.tar.gz | |
Merge branch 'stable'
Conflicts:
hakyll.cabal
Diffstat (limited to 'src')
| -rw-r--r-- | src/Hakyll.hs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Hakyll.hs b/src/Hakyll.hs index 9dd10a0..249d3a8 100644 --- a/src/Hakyll.hs +++ b/src/Hakyll.hs @@ -1,5 +1,6 @@ -- | Top-level module exporting all modules that are interesting for the user -- +{-# LANGUAGE CPP #-} module Hakyll ( module Hakyll.Core.Compiler , module Hakyll.Core.Configuration @@ -9,7 +10,9 @@ module Hakyll , module Hakyll.Core.Resource.Provider , module Hakyll.Core.Routes , module Hakyll.Core.Rules +#ifdef UNIX_FILTER , module Hakyll.Core.UnixFilter +#endif , module Hakyll.Core.Util.Arrow , module Hakyll.Core.Util.File , module Hakyll.Core.Util.String @@ -43,7 +46,9 @@ import Hakyll.Core.Resource import Hakyll.Core.Resource.Provider import Hakyll.Core.Routes import Hakyll.Core.Rules +#ifdef UNIX_FILTER import Hakyll.Core.UnixFilter +#endif import Hakyll.Core.Util.Arrow import Hakyll.Core.Util.File import Hakyll.Core.Util.String |