diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-25 11:43:10 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-25 11:43:10 +0200 |
| commit | 10ac081b3c4ebb9b29b81b30f5efe6622f4212bc (patch) | |
| tree | fedfe7efc494145d0b46e91ba5a94c47cb0c1b6f /ftnoir_tracker_ht/ht_video_widget.cpp | |
| parent | 6baa8ca1070612e5d7cbae7aa62cbe4a9e51ad40 (diff) | |
| parent | 24538cf3a3a91481851618791b11be81437563e4 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_ht/ht_video_widget.cpp')
| -rw-r--r-- | ftnoir_tracker_ht/ht_video_widget.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ftnoir_tracker_ht/ht_video_widget.cpp b/ftnoir_tracker_ht/ht_video_widget.cpp index ef58c98f..02fe71d1 100644 --- a/ftnoir_tracker_ht/ht_video_widget.cpp +++ b/ftnoir_tracker_ht/ht_video_widget.cpp @@ -7,8 +7,6 @@ #include "ht_video_widget.h" -using namespace std; - void HTVideoWidget::update_image(unsigned char *frame, int width, int height) { QMutexLocker foo(&mtx); |