Marc Zinnschlag 73df51695c Merge remote branch 'gus/Factions2' ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/statsextensions.cpp		2012-04-13 14:49:37 +02:00
..
vmformat.txt	Merge remote branch 'gus/Factions2'	2012-04-13 14:49:37 +02:00