1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 15:39:51 +00:00
mrcheko fc6366fb27 Merge remote-tracking branch 'upstream/master'
Equipping_Weapon check isn't needed cause there won't be WeapType_None in
that case

Conflicts:
	apps/openmw/mwmechanics/character.cpp
2014-06-13 14:12:41 +04:00
..
2014-06-10 21:34:47 +02:00
2014-06-12 07:04:57 +10:00