scrawl 51b8a76a68 merged by branches together, starting with alchemy window ... Merge branch 'guimode_stacking' into next Conflicts: apps/openmw/mwgui/mode.hpp		2012-05-24 15:57:23 +02:00
..
inputmanager.cpp	merged by branches together, starting with alchemy window	2012-05-24 15:57:23 +02:00
inputmanager.hpp	allow stacking gui modes	2012-05-23 12:23:35 +02:00