Revert "Merge branch 'master' of git.omp.am:/home/omp/git/conky"
authorBrenden Matthews <brenden@rty.ca>
Fri, 7 Aug 2009 07:23:27 +0000 (01:23 -0600)
committerBrenden Matthews <brenden@rty.ca>
Fri, 7 Aug 2009 07:23:27 +0000 (01:23 -0600)
commitd7838b87bf83c86dff47493493c71dfe3678a3c6
tree71a1c72b97529f3fffea3c1855787a2aa051692f
parent098e28598f92a2b91951ea1cce0c2d35f65b7462
Revert "Merge branch 'master' of git.omp.am:/home/omp/git/conky"

This reverts commit d710ea8b9d134c1b61510c400f99006f5b07c10c, reversing
changes made to 9827726ae5a13a49a9bcb3528db9a251e0e99530.

Also didn't meant to push this.
src/conky.c
src/conky.h
src/libmpdclient.c
src/mail.c