]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' into unicode
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Sat, 16 Feb 2008 02:12:38 +0000 (20:12 -0600)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Sat, 16 Feb 2008 02:12:38 +0000 (20:12 -0600)
commit2a2d7cf04ea4ceaa209a462c8cf1e77d38bb863b
tree4835bcf39680250ac64f4d3c661a19bdfa9038b4
parent4678da88613322e38acf4449d22accfdfbc84dea
parent900e82b5522cfa8d9f27694953d751dc754834b2
Merge branch 'master' into unicode

Conflicts:

core/io/encodings/utf16/utf16-tests.factor
core/io/encodings/utf16/utf16.factor
core/io/encodings/utf8/utf8-tests.factor
core/io/encodings/encodings.factor
core/io/encodings/utf8/utf8-tests.factor