]> gitweb.factorcode.org Git - factor.git/commitdiff
Fix conflict
authorunknown <Administrator@.(none)>
Sun, 9 Nov 2008 03:41:33 +0000 (21:41 -0600)
committerunknown <Administrator@.(none)>
Sun, 9 Nov 2008 03:41:33 +0000 (21:41 -0600)
1  2 
basis/cpu/ppc/linux/linux.factor
basis/cpu/ppc/macosx/macosx.factor

Simple merge
Simple merge