David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # README.md # apps/openmw/mwgui/quickkeysmenu.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/combat.cpp		2018-07-04 01:52:29 +03:00
..
actor.cpp	Merge pull request #440 from OpenMW/master	2018-05-27 16:10:16 +03:00
actor.hpp	Revert "Merge pull request #1701 from akortunov/standfix"	2018-05-26 11:35:48 +00:00
collisiontype.hpp
convert.hpp
physicssystem.cpp	Merge pull request #456 from OpenMW/master while resolving conflicts	2018-07-04 01:52:29 +03:00
physicssystem.hpp	Merge pull request #440 from OpenMW/master	2018-05-27 16:10:16 +03:00
trace.cpp	traceDown fix	2017-02-11 17:53:11 +01:00
trace.h