Merge branch 'master' of https://github.com/wgois/OIS

Conflicts: demos/OISConsole.cpp Had pushed this fix to the wrong repo previously - KR

Merge branch 'master' of https://github.com/wgois/OIS
Conflicts: demos/OISConsole.cpp Had pushed this fix to the wrong repo previously - KR
7087bd0f · Kyle Rassweiler · abd16784 · 692546bf · 7087bd0f · 7087bd0f
Commit 7087bd0f authored Nov 15, 2015 by Kyle Rassweiler
20 changed files
--- a/Win32/ois_vc9.sln
+++ b/Win32/ois_vc9.sln
--- a/Win32/resource.h
+++ b/Win32/resource.h
--- a/acinclude.m4
+++ b/acinclude.m4
--- a/bootstrap
+++ b/bootstrap
--- a/demos/FFConsoleDemo.cpp
+++ b/demos/FFConsoleDemo.cpp
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
--- a/demos/OISConsole.cpp
+++ b/demos/OISConsole.cpp
--- a/includes/OIS.h
+++ b/includes/OIS.h
--- a/includes/OISConfig.h
+++ b/includes/OISConfig.h
--- a/includes/OISEffect.h
+++ b/includes/OISEffect.h
--- a/includes/OISEvents.h
+++ b/includes/OISEvents.h
--- a/includes/OISException.h
+++ b/includes/OISException.h
--- a/includes/OISFactoryCreator.h
+++ b/includes/OISFactoryCreator.h
--- a/includes/OISForceFeedback.h
+++ b/includes/OISForceFeedback.h
--- a/includes/OISInputManager.h
+++ b/includes/OISInputManager.h
--- a/includes/OISInterface.h
+++ b/includes/OISInterface.h
--- a/includes/OISJoyStick.h
+++ b/includes/OISJoyStick.h
--- a/includes/OISKeyboard.h
+++ b/includes/OISKeyboard.h
--- a/includes/OISMouse.h
+++ b/includes/OISMouse.h
--- a/includes/OISMultiTouch.h
+++ b/includes/OISMultiTouch.h