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

Conflicts:
	demos/OISConsole.cpp

Had pushed this fix to the wrong repo previously - KR

.gitattributes

+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto

Makefile.am

-SUBDIRS =  src includes demos
+SUBDIRS =  src includes
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = OIS.pc

ReadMe.txt → README.md

-======================================================================================
-================ LICENSE =============================================================
-======================================================================================
-
-The zlib/libpng License
-
-Copyright (c) 2005-2010 Phillip Castaneda (pjcast -- www.wreckedgames.com)
-
-This software is provided 'as-is', without any express or implied warranty. In no 
-event will the authors be held liable for any damages arising from the use of this 
-software.
-
-Permission is granted to anyone to use this software for any purpose, including 
-commercial applications, and to alter it and redistribute it freely, subject to the 
-following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not claim that 
-		you wrote the original software. If you use this software in a product, 
-		an acknowledgment in the product documentation would be appreciated 
-		but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be 
-		misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source distribution.
+# OIS: Object oriented Input System
 
+Cross Platform Object Oriented Input Lib System. Meant to be very robust and
+compatiable with many systems and operating systems.
 
-======================================================================================
-================ LICENSE EXPLAINED ===================================================
-======================================================================================
-In case the license was not clear enough... Basically, you can link with this lib 
-which puts no restrictions on what you have to license your code as. You can modify 
-this lib, and not have release your changes. Though, as explained above, <bold> 
-Altered source versions must be plainly marked as such, and must not be misrepresented
-as being the original software </bold>
+This is the official repository and is a continuation of the great work done by pjcast on the old sourceforge repo.
 
-This is to allow users the greatest flexibility in what you can use this lib for.
+## Todo
 
-======================================================================================
-================ INFO ================================================================
-======================================================================================
-
-Cross Platform Object Oriented Input Lib System. Meant to be very robust and 
-compatiable with many systems and operating systems
+- Add CMake for compiling
+- Merge pull requests/patches send in over time
+- Cleanup and remove dead-code
+- Start implementing support for new platforms and backends
 
+## Compiling:
 Win32/
 	Contains Visual Studio .Net Solution Files
 	Contains CodeBlocks project files for OIS
@@ -74,3 +44,37 @@ LinuxCB/
 Mac/
 	XCode-2.2/
 		Working, mostly complete OSX vackend.
+
+## License
+
+The zlib/libpng License
+
+Copyright (c) 2005-2010 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no
+event will the authors be held liable for any damages arising from the use of this
+software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to the
+following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not claim that
+		you wrote the original software. If you use this software in a product,
+		an acknowledgment in the product documentation would be appreciated
+		but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+		misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+
+
+### License Explained
+In case the license was not clear enough... Basically, you can link with this lib
+which puts no restrictions on what you have to license your code as. You can modify
+this lib, and not have release your changes. Though, as explained above,
+**Altered source versions must be plainly marked as such, and must not be misrepresented
+as being the original software.**
+
+This is to allow users the greatest flexibility in what you can use this lib for.