2 commits

Author	SHA1	Message	Date
greye	7303d595dd	resolving conflicts	2012-08-17 15:36:51 +04:00
Marc Zinnschlag	0231533d05	Issue #107: InputManager is accessed only through the interface class from now on	2012-08-11 17:53:39 +02:00