[Performous-commit] Lasse Karkkainen : Merge branch 'inputcleanup'

[Lasse Kärkkäi. <tr...@us...>]

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Nov  5 09:52:49 2012 +0200

Merge branch 'inputcleanup'

Conflicts:
	game/controllers.cc

---