Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

author Nikolas Garofil <garo@dunaldi.garofil.be>

Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)

committer Nikolas Garofil <garo@dunaldi.garofil.be>

Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)
author Nikolas Garofil <garo@dunaldi.garofil.be>
Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)
committer Nikolas Garofil <garo@dunaldi.garofil.be>
Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)
diff --cc src/conky.c
Simple merge
diff --cc src/core.c
Simple merge
author	Nikolas Garofil <garo@dunaldi.garofil.be>
	Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)
committer	Nikolas Garofil <garo@dunaldi.garofil.be>
	Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)
		1	2
src/conky.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core.c	patch \|	diff1 \|	diff2 \|	blob \| history