scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/openmw/mwgui/settingswindow.cpp extern/oics/ICSInputControlSystem_joystick.cpp files/mygui/openmw_settings_window.layout		2015-02-27 22:21:02 +01:00
..
launcher
mac
materials
mygui	Merge remote-tracking branch 'upstream/master'	2015-02-27 22:21:02 +01:00
opencs
ui
water
windows
wizard
CMakeLists.txt	Minor code cleanup	2015-02-27 22:19:08 +01:00
gamecontrollerdb.txt
opencs.desktop
opencs.ini
openmw-mimeinfo.xml
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop
settings-default.cfg	Merge remote-tracking branch 'upstream/master'	2015-02-27 22:21:02 +01:00
transparency-overrides.cfg