7c1d1c43e5
Conflicts: docs/changelog.txt |
||
|---|---|---|
| .. | ||
| Buildings.cpp | ||
| Burrows.cpp | ||
| Constructions.cpp | ||
| Designations.cpp | ||
| Engravings.cpp | ||
| EventManager.cpp | ||
| Filesystem.cpp | ||
| Graphic.cpp | ||
| Gui.cpp | ||
| Items.cpp | ||
| Job.cpp | ||
| Kitchen.cpp | ||
| MapCache.cpp | ||
| Maps.cpp | ||
| Materials.cpp | ||
| Notes.cpp | ||
| Once.cpp | ||
| Persistence.cpp | ||
| Random.cpp | ||
| Renderer.cpp | ||
| Screen.cpp | ||
| Translation.cpp | ||
| Units.cpp | ||
| Windows.cpp | ||
| World.cpp | ||