You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		9 years ago
..
inputmanagerimp.cpp	Merge remote-tracking branch 'yar/master' into Even	9 years ago
inputmanagerimp.hpp	Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100)	9 years ago