Merge remote branch 'origin/master' into lua-config

Browse Source

Conflicts:
	cmake/ConkyBuildOptions.cmake
	src/conky.cc

...

This commit is contained in:

Pavel Labath 2010-11-23 16:49:18 +01:00

parent cc98b26119 a8d633009d

commit c9e855060d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available