diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-26 19:42:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-26 19:42:24 -0400 |
| commit | 117df9c3714f2366d4f10d63fce41a608d96308e (patch) | |
| tree | 47155e8948b3137cf2ee527afe2984899a3685eb /git-annex.cabal | |
| parent | d2b9c300b12a025de66f39efafd7962dc591a330 (diff) | |
| parent | 26fb68355b4ad95f99b2d14110e683109d0bab3d (diff) | |
Merge branch 'master' into xmpp
Conflicts:
Assistant/Threads/NetWatcher.hs
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 862d9f9a5..887cd9841 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -83,7 +83,7 @@ Executable git-annex C-Sources: Utility/libkqueue.c if os(linux) && flag(Dbus) - Build-Depends: dbus (>= 0.10.2) + Build-Depends: dbus (>= 0.10.3) CPP-Options: -DWITH_DBUS if flag(Webapp) && flag(Assistant) |