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
9a08141389
Fix the "ISO C does not permit named variadic macros" in maintainer mode
...
and a few other that have cropped up in the process
2010-11-12 19:48:06 +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
886049122c
Add missing memory header needed by std::unique_ptr
2010-02-09 17:43:56 +01:00
Pavel Labath
3d70f3a415
Fix `ISO C++ forbids variable length array' errors with maintainer mode enabled
2010-02-09 15:54:55 +01:00
Nikolas Garofil
043b12b15a
cpp-ify a lot of files
2010-02-09 13:11:56 +01:00
