merge conflicts

This commit is contained in:
Henri van der Riet
2024-09-02 21:21:20 +02:00
parent e750727743
commit 5b0ddbd5f7
44 changed files with 492 additions and 495 deletions

View File

@@ -272,7 +272,7 @@ bool GLGizmoText::on_init()
m_desc["thickness"] = _L("Thickness");
m_desc["text_gap"] = _L("Text Gap");
m_desc["angle"] = _L("Angle");
m_desc["embeded_depth"] = _L("Embeded\ndepth");
m_desc["embeded_depth"] = _L("Embedded\ndepth");
m_desc["input_text"] = _L("Input text");
m_desc["surface"] = _L("Surface");