David Cernat 6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
2017-02-10 21:39:16 +02:00
..
2017-01-27 19:44:35 +08:00
2017-02-10 11:37:36 +01:00
2016-08-28 21:42:48 +02:00