diff options
author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2011-09-19 00:16:46 +0200 |
---|---|---|
committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2011-09-19 00:16:46 +0200 |
commit | d0a216d89697f900729fd427a8dd833a123a6c25 (patch) | |
tree | 8a5f7cabf1335aeb3b64a15c3676c2bc02ea0b76 /Setup.lhs | |
parent | f9f6390c7399bb67c2e965e7cf28a889ff986198 (diff) | |
parent | 8833a8166387075d75ee15690a58cbd2aacf2a67 (diff) | |
download | xmobar-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