]> gitweb.factorcode.org Git - factor.git/commit
Fix conflicts
authorSlava Pestov <slava@factorcode.org>
Sun, 6 Jan 2008 18:17:50 +0000 (14:17 -0400)
committerSlava Pestov <slava@factorcode.org>
Sun, 6 Jan 2008 18:17:50 +0000 (14:17 -0400)
commit4e43b946f9cc185b0226fb104a4d789f7ffeeb0e
tree67fb24acfeedf58c552b0725e69c0a9b4355faea
parent8285eeda9a01b762673dfe038738506fe934d441
parent7692300311d6361058f511627b4c701ab62a32e3
Fix conflicts
core/bootstrap/primitives.factor
core/io/crc32/crc32.factor
core/source-files/source-files.factor
extra/assoc-heaps/assoc-heaps.factor
extra/combinators/lib/lib.factor
extra/delegate/delegate.factor
extra/macros/macros.factor
extra/sequences/lib/lib.factor
extra/xml/utilities/utilities.factor