scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwgui/dialogue.cpp apps/openmw/mwrender/globalmap.cpp files/mygui/CMakeLists.txt		2012-10-17 18:17:53 +02:00
..
openengine	Merge branch 'Travel_Dialogue' into training_travel	2012-10-17 18:17:53 +02:00
platform	removed tabs	2012-03-02 14:18:10 +04:00