diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-07-21 18:27:35 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-07-21 18:27:35 +0200 |
| commit | 7c38acde5da92181b3f1da44fdd52bb732d145e9 (patch) | |
| tree | 9878efa0270504816a9cfed18d6cc2ac443b7a6b /src/Config.hs | |
| parent | f24d03d994c59dd9d91fd280272254eeb6a03b19 (diff) | |
| parent | 0f8e3e7cf4afb28a9ed8c1922f8090c67d4714f1 (diff) | |
| download | xmobar-7c38acde5da92181b3f1da44fdd52bb732d145e9.tar.gz xmobar-7c38acde5da92181b3f1da44fdd52bb732d145e9.tar.bz2 | |
Merge remote-tracking branch 'math/dev/mpd-idle' into mpd
Conflicts:
xmobar.cabal
Diffstat (limited to 'src/Config.hs')
0 files changed, 0 insertions, 0 deletions