Files
mirror-conky/extras/vim/syntax
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
..
2009-05-17 22:11:40 -06:00