gugus 0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions ...

Conflicts:
	apps/openmw/mwclass/npc.cpp

2011-03-15 13:36:25 +01:00

..

creaturestats.hpp

…

magiceffects.cpp

…

magiceffects.hpp

…

mechanicsmanager.cpp

Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions

2011-03-15 13:36:25 +01:00

mechanicsmanager.hpp

…

movement.hpp

…

npcstats.hpp

…

stat.hpp

…