David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts ... # Conflicts: # .gitignore # apps/openmw/mwmechanics/actors.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp		2017-08-31 15:14:13 +03:00
..
launcher
mac	[macOS] Fixes accidental loading of plugins from system-wide Qt install	2017-07-30 15:43:45 +02:00
mygui	Merge pull request #280 from OpenMW/master while resolving conflicts	2017-08-31 15:14:13 +03:00
opencs
shaders
tes3mp	[General] Use address keys with clearer meaning in tes3mp config files	2017-07-03 01:31:48 +03:00
ui	Changing "New Installation" to "Retail CD/DVD" for clarity	2017-08-09 00:20:49 -05:00
windows
wizard
CMakeLists.txt
gamecontrollerdb.txt
openmw-cs.cfg
openmw-cs.desktop
openmw.appdata.xml
openmw.bmp
openmw.cfg	Remove evil "implicit GetJournalIndex" hack from expression parser	2017-04-03 01:44:26 +02:00
openmw.cfg.local	Remove evil "implicit GetJournalIndex" hack from expression parser	2017-04-03 01:44:26 +02:00
openmw.desktop
settings-default.cfg	Do not allow to loot fighting actors during death animation (bug #3528)	2017-08-07 09:55:50 +04:00
version.in