Merge branch 'master' of git://github.com/ageldama/factor Conflicts: basis/io/encodings/korean/korean-docs.factor basis/io/encodings/korean/korean-tests.factor basis/io/encodings/korean/korean.factor |
||
---|---|---|
.. | ||
authors.txt | ||
gb-18030-2000.xml | ||
gb18030-docs.factor | ||
gb18030-tests.factor | ||
gb18030.factor | ||
summary.txt |