]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'slots' of git://factorcode.org/git/factor into slots
authorsheeple <sheeple@oberon.local>
Sat, 26 Sep 2009 08:12:42 +0000 (03:12 -0500)
committersheeple <sheeple@oberon.local>
Sat, 26 Sep 2009 08:12:42 +0000 (03:12 -0500)
commit01a4047126a253a0cbe46c0aee627a4fd0b74174
tree2c046c2b9cfe40a346b650659916c35cb0cb436b
parent257bf877e7d65d1ff1dcbdfde0f905eac8520dec
parent30bca97b61ef5b28b5c7cabd64dcbca517a41b83
Merge branch 'slots' of git://factorcode.org/git/factor into slots

Conflicts:

basis/cpu/x86/x86.factor
basis/compiler/cfg/instructions/instructions.factor
basis/cpu/architecture/architecture.factor
basis/cpu/ppc/ppc.factor
basis/cpu/x86/x86.factor