diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 02:04:11 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 02:04:11 +0200 |
| commit | 51fb3e42f915c3b538c423cfb9e5dfae11778717 (patch) | |
| tree | 053a64cd587d7cc1fb1fc426da5ab3a3cf4d6b9d /facetracknoir/global-shortcuts.cpp | |
| parent | 463737c1b50246c56a67c35c1116732006348593 (diff) | |
| parent | b948329c7ae6ab2ff546cba43cdc4aca9b743cfd (diff) | |
Merge branch 'master' of github.com:opentrack/opentrack
Conflicts:
facetracknoir/tracker.cpp
ftnoir_filter_accela/ftnoir_filter_accela.cpp
ftnoir_filter_accela/ftnoir_filter_accela.h
ftnoir_filter_base/ftnoir_filter_base.h
ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to 'facetracknoir/global-shortcuts.cpp')
| -rw-r--r-- | facetracknoir/global-shortcuts.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/facetracknoir/global-shortcuts.cpp b/facetracknoir/global-shortcuts.cpp index 286200c0..8666333c 100644 --- a/facetracknoir/global-shortcuts.cpp +++ b/facetracknoir/global-shortcuts.cpp @@ -1,6 +1,6 @@ #include "facetracknoir/facetracknoir.h" -#if defined(__WIN32) || defined(_WIN32) +#if defined(_WIN32) #include <windows.h> #include <strmif.h> #include <dshow.h> |