diff base/Scavenger.h @ 1222:771a17925576 piper

Merge from branch 3.0-integration
author Chris Cannam
date Thu, 20 Oct 2016 11:19:34 +0100
parents 6b847a59d908
children 48e9f538e6e9
line wrap: on
line diff
--- a/base/Scavenger.h	Mon Oct 17 16:39:36 2016 +0100
+++ b/base/Scavenger.h	Thu Oct 20 11:19:34 2016 +0100
@@ -26,7 +26,6 @@
 
 #include <vector>
 #include <list>
-#include <sys/time.h>
 #include <QMutex>
 #include <iostream>