Marc Zinnschlag b157273cd9 Merge branch 'next' ... Conflicts: apps/openmw/main.cpp		2011-07-31 19:28:12 +02:00
..
caelum	Mac: further fixes for new resource folder location	2011-06-26 21:15:29 +04:00
mygui_3.0.1	Merge branch 'next'	2011-07-31 19:28:12 +02:00