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, 24 insertions, 0 deletions

diff --git a/contrib/ppjoy/ppjoy mapping for facetracknoir.jpg b/contrib/ppjoy/ppjoy mapping for facetracknoir.jpg
new file mode 100644
index 00000000..052c6899
--- /dev/null
+++ b/contrib/ppjoy/ppjoy mapping for facetracknoir.jpg
diff --git a/contrib/ppjoy/readme.txt b/contrib/ppjoy/readme.txt
new file mode 100644
index 00000000..20c52111
--- /dev/null
+++ b/contrib/ppjoy/readme.txt
@@ -0,0 +1,24 @@
+FaceTrackNoIR for PPJoy 'enabled' games/programs.
+
+FaceTrackNoIR was made compatible with the PPJoy virtual joystick(s), that can be used by various other programs as input.
+
+To start the PPJoy protocol-server in FaceTrackNoIR, select Virtual Joystick in the 'game-protocol' listbox. The 
+settings, necessary to configure PPJoy for FaceTrackNoIR as included in the PPJoy folder, in the file 
+PPJoy mapping for FaceTrackNoIR.jpg.
+
+PPJoy was made by Deon van der Westhuysen and is unfortunately not updated anymore. You can download it from the website
+http://shareware.pcmag.com/free/Miscellaneous-Utilities/PPJoy/75176.html, but possibly from others as well...
+
+
+Regards,
+
+
+The FaceTrackNoIR team:
+
+Wim Vriend
+Ron Hendriks
+
+
+
+
+Disclaimer: For usage of 3rd party software like PPJoy, the FaceTrackNoIR team is not responsible. Use it at your own risk.
\ No newline at end of file