]> gitweb.factorcode.org Git - factor.git/commit
Fix conflicts
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 27 Apr 2008 08:19:41 +0000 (03:19 -0500)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 27 Apr 2008 08:19:41 +0000 (03:19 -0500)
commit9a5d34ae7b462ddeebaf16b9e21834aea6785571
tree9e3bc289103221b76197a29bc59e4b83efd072a3
parent7a7d7be3240d51a7c7a11bc7994c5097427a7bd6
parent081d71727a7592c52b8adfbcaef90c6d74555c5e
Fix conflicts
core/parser/parser.factor
core/words/words-docs.factor
extra/calendar/format/format-tests.factor
extra/calendar/format/format.factor
extra/http/server/server.factor
extra/locals/locals-docs.factor
extra/locals/locals.factor
extra/webapps/planet/planet.factor