Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
[monky] / src / combine.c
2010-01-01 Brenden MatthewsUpdate copyright notices.
2009-11-03 Phil Suttercombine: convert to generic object payload
2009-11-03 Phil Suttercombine: outsource code