]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge git://spitspat.com/git/factor
authorU-C4\Administrator <Administrator@c4.(none)>
Thu, 27 Sep 2007 20:13:23 +0000 (15:13 -0500)
committerU-C4\Administrator <Administrator@c4.(none)>
Thu, 27 Sep 2007 20:13:23 +0000 (15:13 -0500)
Conflicts:

core/compiler/test/intrinsics.factor
vm/cpu-x86.h

1  2 
core/compiler/test/intrinsics.factor

Simple merge