18 Commits

Author	SHA1	Message	Date
Pavel Labath	0852aa4fcd	Merge remote branch 'origin/master' into lua-config ... Conflicts: src/ccurl_thread.cc src/conky.cc src/llua.cc src/logging.h src/nvidia.cc	2010-11-13 20:05:59 +01:00
Pavel Labath	758c2ed674	Use std::min instead of the MIN macro	2010-11-12 20:08:34 +01:00
Pavel Labath	47d9a63dff	Make update_interval{,_on_battery} lua settings	2010-09-11 14:25:19 +02:00
Pavel Labath	a9893684ac	Make max_user_text a lua setting	2010-08-29 20:01:05 +02:00
Pavel Labath	6364bbd380	Make lua_{draw_hook_{pre,post},{shutdown,startup}_hook} lua settings	2010-08-29 15:56:15 +02:00
Pavel Labath	26cb39f67c	Make lua_load a lua setting	2010-08-29 15:45:38 +02:00
Pavel Labath	78ba5c2800	Merge remote branch 'origin/master' into lua-config ... Conflicts: src/conky.cc src/conky.h src/top.cc	2010-06-20 19:09:13 +02:00
Pavel Labath	e70df5e477	Ignore spaces in {} when breaking up arguments to $lua	2010-06-18 17:55:49 +02:00
Pavel Labath	67e37668ec	make border_width a lua setting	2010-04-23 01:22:22 +02:00
Pavel Labath	96c966b7a6	Make border_{inner,outer}_margin a lua setting	2010-04-22 21:59:12 +02:00
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