Merge remote-tracking branch 'origin/develop' into develop-pre-release

This commit is contained in:
mattijs
2018-05-31 17:34:16 +01:00
1098 changed files with 4845 additions and 3834 deletions

View File

@ -186,7 +186,7 @@ int main(int argc, char *argv[])
wordHashSet names;
forAllConstIters(rp, iter)
{
names.insertMany(iter.object());
names.insert(iter.object());
}
regionNames = names.sortedToc();