]> gitweb.factorcode.org Git - factor.git/commit
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)
commit7a6a280b5c057b4960b37b34da1648e66bdd6706
treedbcf61cda474510101c0c05cf60ca9d7aa33f443
parentf7fe84e5634a4f2c05b019479dfe072a8bb9f457
parentabc3915387c145215dd50f8923796c71c46fd2b3
Fix conflict
basis/cpu/ppc/linux/linux.factor
basis/cpu/ppc/macosx/macosx.factor