[merge] merging in master changes

This commit is contained in:
Al
2016-12-21 15:40:25 -05:00
10 changed files with 260 additions and 110 deletions

View File

@@ -116,6 +116,8 @@ void add_latin_alternatives(string_tree_t *tree, char *str, size_t len, uint64_t
}
free(transliterated);
transliterated = NULL;
} else {
string_tree_add_string(tree, str);
}
if (prev_string != NULL) {