Merge branch 'master' of git.omp.am:/home/omp/git/conky
[monky] / data /
drwxr-xr-x   ..
-rw-r--r-- 1152 Makefile.am
-rw-r--r-- 2532 conky.conf
-rw-r--r-- 1848 conky_no_x11.conf