Marc Zinnschlag ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' ... Conflicts: apps/openmw/mwrender/animation.cpp		2013-07-23 09:12:23 +02:00
..
inputmanagerimp.cpp	Merge remote-tracking branch 'gus/MeleeCombat2'	2013-07-23 09:12:23 +02:00
inputmanagerimp.hpp	added ability to close container windows with the activation key	2013-07-15 02:18:24 +02:00