diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 09:01:32 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 09:01:32 +0100 |
commit | d785d3616500d5846ac8c5f5a6347da832a593b4 (patch) | |
tree | ac670a125c5b880ad7e4b4f24a8635da4e66f0da /opentrack/tracker.h | |
parent | 232c2ba8aca7900eaa950c48813ddfaca8a749a8 (diff) | |
parent | 9b736d361bcde7a2ddaf3fe54b471c0e658e94f4 (diff) |
Merge branch 'unstable' into trackhat
* unstable:
cmake: cleanup hydra
rename gui directory
move to subdirectory-based build system
cmake: switch to GNU CC 5.2.0 in mingw-w64 toolchain file
rift-080: forgot ovr_Initialize()
rift 025: fix name
Diffstat (limited to 'opentrack/tracker.h')
-rw-r--r-- | opentrack/tracker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opentrack/tracker.h b/opentrack/tracker.h index b0e89455..890660e1 100644 --- a/opentrack/tracker.h +++ b/opentrack/tracker.h @@ -16,7 +16,7 @@ #include "simple-mat.hpp" #include "selected-libraries.hpp" -#include "qfunctionconfigurator/functionconfig.h" +#include "spline-widget/functionconfig.h" #include "main-settings.hpp" #include "options.hpp" |