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_protocol_fsuipc/ftnoir_fsuipccontrols.ui | |
| 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_protocol_fsuipc/ftnoir_fsuipccontrols.ui')
0 files changed, 0 insertions, 0 deletions