mirror of
https://github.com/OpenMW/openmw.git
synced 2025-11-02 21:56:38 +00:00
Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were. |
||
|---|---|---|
| .. | ||
| bsa | ||
| compiler | ||
| esm | ||
| esm_store | ||
| file_finder | ||
| files | ||
| interpreter | ||
| misc | ||
| nif | ||
| nifbullet | ||
| nifogre | ||
| nifoverrides | ||
| settings | ||
| terrain | ||
| to_utf8 | ||
| CMakeLists.txt | ||
| doc.hpp | ||