summaryrefslogtreecommitdiffhomepage
path: root/Setup.lhs
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2011-09-19 00:16:46 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2011-09-19 00:16:46 +0200
commitd0a216d89697f900729fd427a8dd833a123a6c25 (patch)
tree8a5f7cabf1335aeb3b64a15c3676c2bc02ea0b76 /Setup.lhs
parentf9f6390c7399bb67c2e965e7cf28a889ff986198 (diff)
parent8833a8166387075d75ee15690a58cbd2aacf2a67 (diff)
downloadxmobar-d0a216d89697f900729fd427a8dd833a123a6c25.tar.gz
xmobar-d0a216d89697f900729fd427a8dd833a123a6c25.tar.bz2
Merge branch 'screen_update' of git://github.com/skinner33/xmobar into skinner-screen_update
Conflicts: NEWS src/XUtil.hsc
Diffstat (limited to 'Setup.lhs')
0 files changed, 0 insertions, 0 deletions