forked from teamnwah/openmw-tes3coop
Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg |
||
|---|---|---|
| .. | ||
| inputmanagerimp.cpp | ||
| inputmanagerimp.hpp | ||
Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg |
||
|---|---|---|
| .. | ||
| inputmanagerimp.cpp | ||
| inputmanagerimp.hpp | ||