1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +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-11 00:20:46 +04:00
2010-08-07 20:25:17 +02:00
2014-05-01 16:55:15 +02:00
2014-05-24 14:47:51 +02:00
2014-06-06 15:24:06 +02:00
2014-05-01 16:55:15 +02:00
2012-04-11 18:53:13 +02:00
2014-06-11 00:20:46 +04:00