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)
1  2 
configure.ac.in

diff --cc configure.ac.in
Simple merge