mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-24 06:56:36 +00:00
Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwclass/apparatus.cpp apps/openmw/mwclass/armor.cpp apps/openmw/mwclass/book.cpp apps/openmw/mwclass/clothing.cpp apps/openmw/mwclass/container.cpp apps/openmw/mwclass/ingredient.cpp apps/openmw/mwclass/light.cpp apps/openmw/mwclass/lockpick.cpp apps/openmw/mwclass/misc.cpp apps/openmw/mwclass/potion.cpp apps/openmw/mwclass/probe.cpp apps/openmw/mwclass/repair.cpp apps/openmw/mwclass/weapon.cpp apps/openmw/mwgui/window_manager.cpp apps/openmw/mwgui/window_manager.hpp apps/openmw/mwworld/class.cpp |
||
|---|---|---|
| .. | ||
| gbuffer | ||
| mac | ||
| mygui | ||
| shadows | ||
| water | ||
| CMakeLists.txt | ||
| launcher.cfg | ||
| launcher.qss | ||
| openmw.bmp | ||
| openmw.cfg | ||
| openmw.cfg.local | ||
| openmw.desktop | ||
| plugins.cfg.linux | ||
| plugins.cfg.mac | ||
| plugins.cfg.win32 | ||
| settings-default.cfg | ||
| transparency-overrides.cfg | ||