summaryrefslogtreecommitdiffhomepage
path: root/license
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2014-12-29 23:56:42 +0100
committerjao <jao@gnu.org>2014-12-30 00:26:36 +0100
commit22d41c0e611a7c2cc51209a4cc750ee87921e54a (patch)
treeb43d12c74f91a6cdef3878010da9d8935abf1368 /license
parent87e92c4023a4a6cac5b6ff2e95b6d346eef10bd3 (diff)
parenta98ac8fba46b8858959cee6062a49c9121f07fe9 (diff)
downloadxmobar-22d41c0e611a7c2cc51209a4cc750ee87921e54a.tar.gz
xmobar-22d41c0e611a7c2cc51209a4cc750ee87921e54a.tar.bz2
Merge branch 'transparency' of https://github.com/ezyang/xmobar
Conflicts: src/Config.hs src/Main.hs src/Parsers.hs src/XUtil.hsc src/Xmobar.hs
Diffstat (limited to 'license')
0 files changed, 0 insertions, 0 deletions