scrawl f1b138d0a8 Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt		2013-01-07 13:25:15 +01:00
..
gbuffer
mac
materials
mygui
water
CMakeLists.txt
launcher.qss
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop
settings-default.cfg
transparency-overrides.cfg