David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts ... # Conflicts: # README.md		2018-03-09 21:07:46 +02:00
..
launcher	Adding panel for advanced settings.cfg options	2018-01-28 22:49:49 -06:00
mac	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
mygui	Revert "Add slider for refraction size in settings window"	2018-01-01 13:28:14 +01:00
opencs
shaders	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
tes3mp
ui	Adding Max Quicksaves setting to Launcher	2018-02-27 20:17:21 -06:00
windows
wizard
CMakeLists.txt
gamecontrollerdb.txt	Moving controller file out of the controllers subdirectory	2018-01-02 20:58:43 -06:00
gamecontrollerdb_204.txt	Moving controller file out of the controllers subdirectory	2018-01-02 20:58:43 -06:00
gamecontrollerdb_205.txt	Moving controller file out of the controllers subdirectory	2018-01-02 20:58:43 -06:00
openmw-cs.cfg
openmw-cs.desktop
openmw.appdata.xml	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01:00
openmw.bmp
openmw.cfg
openmw.cfg.local
openmw.desktop
settings-default.cfg	Add an option to disable GUI keyboard navigation (Bug #4333)	2018-03-08 23:39:35 +00:00
tes3mp-browser.desktop
version.in