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 /qfunctionconfigurator | |
| parent | 6baa8ca1070612e5d7cbae7aa62cbe4a9e51ad40 (diff) | |
| parent | 24538cf3a3a91481851618791b11be81437563e4 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'qfunctionconfigurator')
| -rw-r--r-- | qfunctionconfigurator/functionconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qfunctionconfigurator/functionconfig.h b/qfunctionconfigurator/functionconfig.h index 7ead2c5d..a8b46597 100644 --- a/qfunctionconfigurator/functionconfig.h +++ b/qfunctionconfigurator/functionconfig.h @@ -14,7 +14,7 @@ #include <QSettings> #include <QMutex> #include <vector> -#include "opentrack/qcopyable-mutex.hpp" +#include "opentrack-compat/qcopyable-mutex.hpp" class Map { private: |