mirror of
https://github.com/OpenMW/openmw.git
synced 2025-11-01 11:26:38 +00:00
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. |
||
|---|---|---|
| .. | ||
| detournavigator | ||
| esm | ||
| esmloader | ||
| files | ||
| lua | ||
| misc | ||
| mwdialogue | ||
| mwscript | ||
| mwworld | ||
| nifloader | ||
| openmw | ||
| settings | ||
| shader | ||
| sqlite3 | ||
| CMakeLists.txt | ||
| openmw_test_suite.cpp | ||