diff options
author | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-10-22 13:58:49 +0200 |
---|---|---|
committer | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-10-22 13:58:49 +0200 |
commit | 0c9f1ac69bad6af19f3129ec50c4899bac5c149a (patch) | |
tree | 8cf11bf32f18d69597992a15eeda89a1ccd0107f /Warp.hs | |
parent | 6684e84f50d60cea956704be91d8ad7e0975564a (diff) | |
download | XMonadContrib-0c9f1ac69bad6af19f3129ec50c4899bac5c149a.tar.gz XMonadContrib-0c9f1ac69bad6af19f3129ec50c4899bac5c149a.tar.xz XMonadContrib-0c9f1ac69bad6af19f3129ec50c4899bac5c149a.zip |
Resolve conflicts between Justin Bogner's C.Desktop patch and latest head.
Ignore-this: ba805e9889d6bda5ea873e3537b0111f
darcs-hash:20091022115849-7f603-c645c8a5aa256445d6caaa8c4bc308f885ee5fe5.gz
Diffstat (limited to 'Warp.hs')
0 files changed, 0 insertions, 0 deletions