]> gitweb.factorcode.org Git - factor.git/commit
Merge commit 'slava/master' into unicode
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Wed, 9 Jan 2008 23:30:59 +0000 (17:30 -0600)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Wed, 9 Jan 2008 23:30:59 +0000 (17:30 -0600)
commit1dfabe3b345fa4a2a8b1091b5b77f7f45c127a1f
tree611f2e7701291a08ed753fbb28bb001cdc4d5e58
parent98226eec9b8910ec4c3d3998414f8fbe6554515c
parent6df84617d69bce8b2f108e93300d572069d2f6b8
Merge commit 'slava/master' into unicode

Conflicts:

core/parser/parser.factor
core/source-files/source-files.factor
extra/unicode/unicode-tests.factor
extra/unicode/unicode.factor
core/io/crc32/crc32.factor
core/parser/parser.factor
core/source-files/source-files.factor
extra/combinators/lib/lib.factor
extra/delegate/delegate.factor
extra/unicode/breaks/breaks.factor
extra/unicode/unicode-tests.factor
extra/unicode/unicode.factor
extra/xml/data/data.factor