Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Tue, 14 Jul 2009 16:47:00 +0000 (18:47 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Tue, 14 Jul 2009 16:47:00 +0000 (18:47 +0200)
commit1e5bc370e49c88211383d85846ef68b3fb937b42
tree9b05a09d9361460f0f1d91b22d285ca5302545be
parent16768a5ad4fdf58e1f7a9a1b949c055c846ea0e2
parentcd92949e6704b38241666e26dc38eae6c9ba6d9c
Merge branch 'master' of git.omp.am:/home/omp/git/conky
src/x11.c