mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-26 09:35:28 +00:00
Marc Zinnschlag
d42747e85b
Merge branch 'master' into dialogue
Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwclass/creature.cpp apps/openmw/mwclass/creature.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp
Languages
C++
93.8%
Lua
3.2%
CMake
1.1%
C
0.6%
GLSL
0.5%
Other
0.8%