Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
[monky] / m4 /
drwxr-xr-x   ..
-rw-r--r-- 4277 ax_openmp.m4
-rw-r--r-- 5228 pkg.m4