8 Commits

Author	SHA1	Message	Date
Pavel Labath	70d53b770f	Merge branch 'master' into lua-config ... Conflicts: src/conky.cc	2010-03-04 18:23:46 +01:00
Pavel Labath	d93dc72e6d	Random C++ification: to_real_path() and current_config	2010-03-04 17:40:20 +01:00
Pavel Labath	12e98c7da5	Port out_to_x setting to lua-config	2010-02-25 22:28:34 +01:00
Nikolas Garofil	1fa465efb6	Use free_and_zero in l*.cc where appropriate	2010-02-24 01:51:02 +01:00
Pavel Labath	47509b38bd	An attempt at making lua bindings work	2010-01-11 00:35:22 +01:00
Brenden Matthews	3e3dd16367	Update modelines and stuff.	2010-01-06 19:45:19 -08:00
Brenden Matthews	7e78f036f0	Use consistent naming for build option macros. ... Probably have broken some build features with this commit.	2010-01-06 18:39:44 -08:00
Brenden Matthews	620e9876a4	C++ conversions WIP. ... Currently stuck on an issue with g++ and using '%lli' with printf/scanf.	2010-01-04 19:21:12 -08:00