]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 6 Feb 2009 04:29:15 +0000 (22:29 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 6 Feb 2009 04:29:15 +0000 (22:29 -0600)
commitae0da1cf983e96fb51df05562817558387e732e9
tree6c729fadead5e2710ea009a96e7a54024a51149d
parent148317846b7b32d88505cd989124521ecf438606
parent67ffc894021de130614cb9d0425d6c8c8681ce62
Fix conflict
basis/math/rectangles/rectangles-tests.factor
basis/math/rectangles/rectangles.factor
basis/math/vectors/vectors.factor
basis/xml/writer/writer-tests.factor
extra/quadtrees/quadtrees-docs.factor
extra/quadtrees/quadtrees-tests.factor
extra/quadtrees/quadtrees.factor