]> gitweb.factorcode.org Git - factor.git/commit
Fix conflicts
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 8 Sep 2009 04:51:25 +0000 (23:51 -0500)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 8 Sep 2009 04:51:25 +0000 (23:51 -0500)
commitbbca00e2aec26098f6d021c3f21b8246eb5aaad3
tree3307d8c65ffa90946344699d29f15fee09093e7c
parent32ecb5d49bb6de970c3ae03acaa71008669d71c5
parent9f9b6bca013ff83c408182d3023ea5d56c1b7fe4
Fix conflicts
basis/alien/c-types/c-types.factor
basis/compiler/tree/propagation/propagation-tests.factor
basis/cpu/ppc/ppc.factor
basis/cpu/x86/x86.factor
basis/specialized-arrays/functor/functor.factor
basis/specialized-arrays/specialized-arrays-tests.factor
basis/struct-arrays/struct-arrays-tests.factor