]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Thu, 1 May 2008 00:45:12 +0000 (19:45 -0500)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Thu, 1 May 2008 00:45:12 +0000 (19:45 -0500)
commit43cbb17e171c4986be9ec2d44aed80ff75902e35
treee7091c896be8eb5cd558c608f8943bce306c50b3
parenteac64bccab46a11de5f3459fd208b4899bb6a52c
parent72fcd2b13319a25b62f1ccc68b9b42d13e593898
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

extra/delegate/delegate.factor
extra/unicode/data/data.factor
extra/delegate/delegate.factor
extra/io/encodings/iana/character-sets
extra/io/encodings/iana/iana.factor
extra/unicode/breaks/breaks.factor
extra/unicode/data/data.factor