merged changes from develop; added authentication support

This commit is contained in:
Guenter Obiltschnig
2017-02-12 23:13:51 +01:00
parent 155c12e2e0
commit 9f8146ccaa
12 changed files with 547 additions and 142 deletions

View File

@@ -59,7 +59,7 @@ std::string Array::toString(int indent) const
for(int i = 0; i < indent; ++i) oss << ' ';
oss << (*it)->toString();
oss << (*it)->toString(indent > 0 ? indent + 2 : 0);
}
if ( indent > 0 )