diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-29 11:05:27 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-29 11:05:27 +0100 |
| commit | 232c2ba8aca7900eaa950c48813ddfaca8a749a8 (patch) | |
| tree | c08da2e256be5b5e80fac3f611f956fef275f142 /ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp | |
| parent | 7128fe581ee2ed25fe8e43ec2be9644e2539e2ad (diff) | |
| parent | 06a0a71f27134a86d19612fd786bfc2ca6f4c4bb (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
fix vtable mess
xargs sed -i -e s/'FaceTrackNoIR Error/Error/g'
support rift 0.2.5, 0.4.2, 0.8.0
rift: finish 0.2.5 support
buffer flush
rename "clientfiles/" to "contrib/" as customary
add dropbox uploader to contrib
add description on wiki for camera offset
Diffstat (limited to 'ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp')
| -rw-r--r-- | ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp b/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp index e5187bd1..6c71d58f 100644 --- a/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp +++ b/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp @@ -20,7 +20,7 @@ RSTrackerControls::RSTrackerControls() void RSTrackerControls::doInstallRSRuntime() { - bool processStarted = QProcess::startDetached("clientfiles\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all"); + bool processStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all"); if(processStarted){ this->close(); } |