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/DemoFFTest/DemoFFTest_vs2010.vcxproj
+++ b/Win32/DemoFFTest/DemoFFTest_vs2010.vcxproj
--- a/Win32/DemoFFTest/FF.rc
+++ b/Win32/DemoFFTest/FF.rc
--- a/Win32/DemoFFTest/resource.h
+++ b/Win32/DemoFFTest/resource.h
--- a/Win32/OIS.rc
+++ b/Win32/OIS.rc
--- a/Win32/OIS.vcproj
+++ b/Win32/OIS.vcproj
--- a/Win32/OIS.workspace
+++ b/Win32/OIS.workspace
--- a/Win32/OIS_vc8.vcproj
+++ b/Win32/OIS_vc8.vcproj
--- a/Win32/OIS_vc9.vcproj
+++ b/Win32/OIS_vc9.vcproj
--- a/Win32/OIS_vs2010.sln
+++ b/Win32/OIS_vs2010.sln
--- a/Win32/OIS_vs2010.vcxproj
+++ b/Win32/OIS_vs2010.vcxproj
--- a/Win32/OIS_vs2010.vcxproj.filters
+++ b/Win32/OIS_vs2010.vcxproj.filters
--- a/Win32/SDL/OIS_sdl_vc8.vcproj
+++ b/Win32/SDL/OIS_sdl_vc8.vcproj
--- a/Win32/SDL/SdlDemo/SdlDemo.cpp
+++ b/Win32/SDL/SdlDemo/SdlDemo.cpp
--- a/Win32/SDL/SdlDemo/SdlDemo.rc
+++ b/Win32/SDL/SdlDemo/SdlDemo.rc
--- a/Win32/SDL/SdlDemo/SdlDemo.vcproj
+++ b/Win32/SDL/SdlDemo/SdlDemo.vcproj
--- a/Win32/SDL/SdlDemo/resource.h
+++ b/Win32/SDL/SdlDemo/resource.h
--- a/Win32/SDL/ois_sdl_vc8.sln
+++ b/Win32/SDL/ois_sdl_vc8.sln
--- a/Win32/ois.cbp
+++ b/Win32/ois.cbp
--- a/Win32/ois.sln
+++ b/Win32/ois.sln
--- a/Win32/ois_vc8.sln
+++ b/Win32/ois_vc8.sln