Marc Zinnschlag b157273cd9 Merge branch 'next'
Conflicts:
	apps/openmw/main.cpp
2011-07-31 19:28:12 +02:00
..
2011-07-31 19:28:12 +02:00