]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor into unicode
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Mon, 10 Mar 2008 03:04:19 +0000 (22:04 -0500)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Mon, 10 Mar 2008 03:04:19 +0000 (22:04 -0500)
commit862dd0b5cb1814cdda5821c116c9396904c7fde0
treee3d1da3db0014d4253a2122d08957b03dd80c998
parent191a61a0244b3e377ece38fcdca481ed0cf6b49e
parent57c772303f73acdb9fedc7d2db497ee3d3ee4e6c
Merge branch 'master' of git://factorcode.org/git/factor into unicode

Conflicts:

extra/io/encodings/ascii/ascii.factor
extra/io/encodings/latin1/latin1.factor
extra/io/encodings/latin1/latin1.factor