diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-18 08:48:46 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-18 08:48:46 +0200 |
| commit | 4209d8a9c4b4cb36054203a263063cc61fe2c3a4 (patch) | |
| tree | f2320924036060020fe78ae917be4bc1e94ccc1b /ftnoir_tracker_pt | |
| parent | 47a512da1e98b88cd96fc761c567cef4eadd376c (diff) | |
| parent | a001c2b6de41f4593ae94005ed5449ef5589ab4d (diff) | |
Merge branch 'unstable' into trackhat-ui
Conflicts:
ftnoir_tracker_pt/point_extractor.cpp
Diffstat (limited to 'ftnoir_tracker_pt')
| -rw-r--r-- | ftnoir_tracker_pt/ftnoir_tracker_pt.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.h b/ftnoir_tracker_pt/ftnoir_tracker_pt.h index 771631cd..3b9f1648 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.h @@ -22,7 +22,6 @@ #include <QMutex> #include <QMutexLocker> #include <QTime> -#include <opencv2/core/core.hpp> #include <atomic> #ifndef OPENTRACK_API # include <boost/shared_ptr.hpp> |