Marc Zinnschlag 160b52162b Merge remote-tracking branch 'scrawl/quick_keys' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp		2012-08-28 09:06:40 +02:00
..
inputmanagerimp.cpp	Merge remote-tracking branch 'scrawl/quick_keys'	2012-08-28 09:06:40 +02:00
inputmanagerimp.hpp	Merge branch 'master' into quick_keys	2012-08-27 18:14:41 +02:00