gugus 03f7740474 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp		2012-07-09 10:39:57 +02:00
..
vmformat.txt	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-07-09 10:39:57 +02:00