Mercurial > hg > svcore
comparison base/Scavenger.h @ 1365:3382d914e110
Merge from branch 3.0-integration
| author | Chris Cannam |
|---|---|
| date | Fri, 13 Jan 2017 10:29:44 +0000 |
| parents | 6b847a59d908 |
| children | 48e9f538e6e9 |
comparison
equal
deleted
inserted
replaced
| 1272:6a7ea3bd0e10 | 1365:3382d914e110 |
|---|---|
| 24 | 24 |
| 25 #include "system/System.h" | 25 #include "system/System.h" |
| 26 | 26 |
| 27 #include <vector> | 27 #include <vector> |
| 28 #include <list> | 28 #include <list> |
| 29 #include <sys/time.h> | |
| 30 #include <QMutex> | 29 #include <QMutex> |
| 31 #include <iostream> | 30 #include <iostream> |
| 32 | 31 |
| 33 /** | 32 /** |
| 34 * A very simple class that facilitates running things like plugins | 33 * A very simple class that facilitates running things like plugins |