Marc Zinnschlag 4bdfbb6d4f Merge branch 'master' into dialogue ...

Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt

2012-03-05 11:34:06 +01:00

..

mygui_3.0.1

Started to weire the dialogue manager and the dialogue GUI

2012-02-05 10:54:56 +01:00