1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
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
..
2015-01-23 15:34:47 +01:00
2015-01-23 15:34:47 +01:00
2014-08-06 00:46:21 +04:00
2014-12-23 17:13:11 +01:00