Go to file
Miroslav Lichvar 1e59b9a048 Merge branch 'master' into f13
Conflicts:
	.gitignore
	conky-1.8.0-audclient.patch
	conky.spec
	sources
2010-10-06 15:46:14 +02:00
.gitignore update to 1.8.1 2010-10-06 15:39:19 +02:00
conky.spec update to 1.8.1 2010-10-06 15:39:19 +02:00
sources update to 1.8.1 2010-10-06 15:39:19 +02:00