1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 23:09:44 +00:00
openmw/files
scrawl 4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
2013-06-15 17:41:42 +02:00
..
launcher
mac
materials
mygui
opencs
ui
water
CMakeLists.txt
opencs.desktop
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop
settings-default.cfg
transparency-overrides.cfg