]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge branch 'master' of git://factorcode.org/git/factor into simd-cleanup
authorJoe Groff <arcata@gmail.com>
Sun, 15 Nov 2009 03:02:39 +0000 (21:02 -0600)
committerJoe Groff <arcata@gmail.com>
Sun, 15 Nov 2009 03:02:39 +0000 (21:02 -0600)
Conflicts:
basis/math/vectors/simd/functor/functor.factor

1  2 
basis/classes/struct/struct.factor
basis/compiler/cfg/intrinsics/intrinsics.factor
basis/compiler/tree/propagation/known-words/known-words.factor
basis/cpu/x86/x86.factor
core/sequences/sequences.factor

Simple merge
Simple merge
Simple merge