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 |
|
Kevin Lyles
|
a251357f1d
|
Fixed gradients to actually use both end colors
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
|
2010-10-15 11:23:08 -07:00 |
|
Pavel Labath
|
b8bed06cc8
|
C++ version of get_x11_color()
|
2010-02-28 12:26:18 +01:00 |
|
Pavel Labath
|
12e98c7da5
|
Port out_to_x setting to lua-config
|
2010-02-25 22:28:34 +01:00 |
|
Pavel Labath
|
54630eb39e
|
Header housekeeping: remove unneeded extern "C", add modelines, add inclusion guards
hopefully, this doesn't break anything
|
2010-02-25 21:50:50 +01: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
|
d3a8c4d22e
|
timed_thread
Convert everything (everything? maybe missed some stuff) from old
timed_thread to new timed_thread.
|
2010-01-04 19:21:12 -08:00 |
|