mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-24 01:56:36 +00:00
8fc09f8c51
Merge conflicts included: * One setting being removed (branch had changed its type). * One setting's description being changed (branch had changed its type). * List of files in components/files was changed both upstream and on the branch. * Upstream had changed something in a file the branch deletes. |
||
|---|---|---|
| .. | ||
| model | ||
| view | ||
| CMakeLists.txt | ||
| editor.cpp | ||
| editor.hpp | ||
| main.cpp | ||