1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 20:31:17 +00:00
conky/extras
Brenden Matthews ddcc8ceb70 Merge branch 'master' into imlib2
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
2009-05-17 22:11:40 -06:00
..
nano Merge branch 'master' into imlib2 2009-05-17 22:11:40 -06:00
vim Merge branch 'master' into imlib2 2009-05-17 22:11:40 -06:00