]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 3 Jul 2008 21:46:21 +0000 (16:46 -0500)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 3 Jul 2008 21:46:21 +0000 (16:46 -0500)
commitef2fddb1ec6f4546cb589b6e7da46bb87289b485
tree0c26f34fe5bf7849de4d893ad60092ee30ec1f8d
parente876349c510ae1708a08a06c6c470c9f88368cf6
parentc16bc0a61ef2b0ade841ffd02263df7ef4b1d1f5
Fix conflict
core/bootstrap/stage2.factor
core/classes/tuple/tuple.factor
core/optimizer/inlining/inlining.factor
core/sequences/sequences-docs.factor
core/sequences/sequences-tests.factor
core/sequences/sequences.factor
extra/sequences/lib/lib.factor