Pavel Labath
ad79c87376
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/conky.cc
2010-11-16 22:55:33 +01:00
Nikolas Garofil
8123e447e2
Replace a CRIT_ERR in combine by trying,throwing and catching
...
PS: I want to replace all similar CRIT_ERR's like this, opinions ?
2010-11-16 13:41:44 +01:00
Pavel Labath
a9893684ac
Make max_user_text a lua setting
2010-08-29 20:01:05 +02:00
Nikolas Garofil
e7ed9a5060
Revert "Use "using namespace std;" and remove all std::'s"
...
This reverts commit 41e80b9833
2010-02-24 20:10:26 +01:00
Nikolas Garofil
41e80b9833
Use "using namespace std;" and remove all std::'s
...
I'm doing this because otherwise i'll will forget to add all those
std::'s and will lose a LOT of time finding the problems.
If you don't agree, undo this patch...
...but i hope you won't :)
2010-02-24 19:39:45 +01:00
Nikolas Garofil
ad1b72ed94
Fix wrong output when nesting $combine-s
2010-02-22 19:27:05 +01:00
Nikolas Garofil
44a9e75290
Fix output of $combine when used in combination with $head
2010-02-22 16:30:37 +01:00
Nikolas Garofil
15e84fcfa1
Fix last memleak in $combine
2010-02-22 14:08:38 +01:00
Nikolas Garofil
e50ec9ded6
Fix $combine reading unallocated memory
2010-02-22 13:02:24 +01:00
Brenden Matthews
3e3dd16367
Update modelines and stuff.
2010-01-06 19:45:19 -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
