1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 00:39:59 +00:00
OpenMW/apps
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
..
bsatool Several warning fixes 2015-01-23 15:34:47 +01:00
esmtool Several warning fixes 2015-01-23 15:34:47 +01:00
essimporter ESSImport: convert script local variables 2015-01-24 16:45:36 +01:00
launcher And the missing includes 2015-01-23 16:06:19 +01:00
mwiniimporter
opencs Revert "Revert "Light charge handling fix"" 2015-01-23 15:33:39 +01:00
openmw Merge remote-tracking branch 'upstream/master' 2015-02-27 22:21:02 +01:00
openmw_test_suite
wizard
doc.hpp