gus ee47e99dad Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 ...

Conflicts:
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp

2013-07-16 11:40:19 +01:00

..

inputmanagerimp.cpp

Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2

2013-07-16 11:40:19 +01:00

inputmanagerimp.hpp

added ability to close container windows with the activation key

2013-07-15 02:18:24 +02:00