summaryrefslogtreecommitdiffhomepage
path: root/xmobar.cabal
diff options
context:
space:
mode:
authorJose A Ortega Ruiz <jao@gnu.org>2010-02-14 20:04:13 +0100
committerJose A Ortega Ruiz <jao@gnu.org>2010-02-14 20:04:13 +0100
commitbcdf6f1ac74bc54d8f6b57c294d9bc9ad80a544e (patch)
treec82db690fdfd10d7fd43b9502170ce59b490a7fb /xmobar.cabal
parent47a5cdddfb46734e5d3449863c9f124dce2f7fbd (diff)
downloadxmobar-bcdf6f1ac74bc54d8f6b57c294d9bc9ad80a544e.tar.gz
xmobar-bcdf6f1ac74bc54d8f6b57c294d9bc9ad80a544e.tar.bz2
Merge conflict in xmonad.cabal resolved
Ignore-this: c65b5ae251b4c3cde6d26b2930a50cb darcs-hash:20100214190413-748be-8def261bcebaf8675280ffa36d05b53d2631f688.gz
Diffstat (limited to 'xmobar.cabal')
-rw-r--r--xmobar.cabal2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmobar.cabal b/xmobar.cabal
index 34b37c2..d2e1618 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -33,7 +33,7 @@ flag with_inotify
executable xmobar
main-is: Main.hs
- other-Modules: Xmobar, Config, Parsers, Commands, XUtil, Runnable, Plugins
+ other-Modules: Xmobar, Config, Parsers, Commands, XUtil, Runnable, Plugins, Plugins.Monitors.StatFS
ghc-options: -funbox-strict-fields -Wall
ghc-prof-options: -prof -auto-all