Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Mon, 20 Jul 2009 22:05:13 +0000 (00:05 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Mon, 20 Jul 2009 22:05:13 +0000 (00:05 +0200)
commit7449c1afa94f8e89e3e667c13031ca9131d46bb9
treebf023b51c94eca2380ee42a835c1b13de4e628ea
parentd817ab7965b6918de4a7d14b92de25c4a272778a
parent9cda78c023cfee67ea30654e34de334ade35ab1d
Merge branch 'master' of git.omp.am:/home/omp/git/conky
configure.ac.in