]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 19 Feb 2009 04:20:05 +0000 (22:20 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 19 Feb 2009 04:20:05 +0000 (22:20 -0600)
commit5e1976633069c0be53edd4f71627667577faa363
treeddbbae9a99ed90d8fd27c2472169ad44677b1ebe
parent277a8270391463aa899fbeb58ce5d45b64a90868
parentb9de229b2358dcd601db1a8fd231f9886ee16d21
Fix conflict
basis/math/functions/functions.factor
core/io/pathnames/pathnames-docs.factor