gugus 0553227ee1 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/player.cpp apps/openmw/mwworld/player.hpp		2012-04-09 14:43:35 +02:00
..
vmformat.txt	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2	2012-04-09 14:43:35 +02:00