Aesylwinn b4a000913c Merge remote-tracking branch 'yar/master' into Even ... # Conflicts: # CMakeLists.txt # apps/openmw/mwdialogue/filter.cpp # apps/openmw/mwmechanics/character.cpp # apps/openmw/mwworld/localscripts.cpp # components/CMakeLists.txt # components/compiler/exprparser.cpp # components/sceneutil/workqueue.cpp		2016-07-17 23:50:52 -04:00
..
inputmanagerimp.cpp	Merge remote-tracking branch 'yar/master' into Even	2016-07-17 23:50:52 -04:00
inputmanagerimp.hpp	Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100)	2015-12-26 18:15:57 +01:00