diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/Timer.cc | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/Timer.cc')
| -rw-r--r-- | src/FbTk/Timer.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc index 385b342..773ef07 100644 --- a/src/FbTk/Timer.cc +++ b/src/FbTk/Timer.cc | |||
| @@ -45,6 +45,8 @@ | |||
| 45 | #include <assert.h> | 45 | #include <assert.h> |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | #include <string.h> | ||
| 49 | |||
| 48 | namespace FbTk { | 50 | namespace FbTk { |
| 49 | 51 | ||
| 50 | Timer::TimerList Timer::m_timerlist; | 52 | Timer::TimerList Timer::m_timerlist; |