merge master via cli

2023-09-16 02:12:58 -03:00
parent 280e5e3987 ad4f8783e3
commit 4a504437d3
1755 changed files with 158132 additions and 131913 deletions
--- a/src/Base/Persistence.cpp
+++ b/src/Base/Persistence.cpp
@@ -131,7 +131,7 @@ void Persistence::dumpToStream(std::ostream& stream, int compression)
        writer.putNextEntry("Persistence.xml");
        writer.setMode("BinaryBrep");

-        //save the content (we need to encapsulte it with xml tags to be able to read single element xmls like happen for properties)
+        //save the content (we need to encapsulate it with xml tags to be able to read single element xmls like happen for properties)
        writer.Stream() << "<Content>" << std::endl;
        Save(writer);
        writer.Stream() << "</Content>";