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

2 files changed, 20 insertions, 0 deletions

diff --git a/contrib/freetracktest/freetracktest.exe b/contrib/freetracktest/freetracktest.exe
new file mode 100644
index 00000000..2965a07f
--- /dev/null
+++ b/contrib/freetracktest/freetracktest.exe
diff --git a/contrib/freetracktest/readme.txt b/contrib/freetracktest/readme.txt
new file mode 100644
index 00000000..ca40906f
--- /dev/null
+++ b/contrib/freetracktest/readme.txt
@@ -0,0 +1,20 @@
+FaceTrackNoIR for Free-track 'enabled' games.
+
+FaceTrackNoIR was made compatible with the Free-track protocol, for which the Free-track source (a well, part of it) was
+translated from Delphi Pascal to C++ (Visual Studio C++, with Qt).
+
+To start the Free-track protocol-server in FaceTrackNoIR, select Free-track in the 'game-protocol' listbox. The program
+'FreeTrackTest.exe' is provided to check, if the protocol-server is running.
+
+FreeTrackTest.exe was created by the Free-track team.
+
+
+
+The FaceTrackNoIR team:
+
+Wim Vriend
+Ron Hendriks
+
+
+
+Disclaimer: For usage of 3rd party software like FreeTrackTest, the FaceTrackNoIR team is not responsible. Use it at your own risk.
\ No newline at end of file