Merge branch 'master' into 'master'

Fixes Albemic typo in OpenMW-CS See merge request OpenMW/openmw!133
6 years ago · fe52bee41d
parent 010cd4987d c0f66ac70c
commit fe52bee41d
1 changed files with 1 additions and 1 deletions
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@ -422,7 +422,7 @@ namespace

    static const char *sApparatusTypes[] =
    {
-        "Mortar & Pestle", "Albemic", "Calcinator", "Retort", 0
+        "Mortar & Pestle", "Alembic", "Calcinator", "Retort", 0
    };

    static const char *sArmorTypes[] =