]> gitweb.factorcode.org Git - factor.git/commit
Fix conflicts
authorslava <slava@factorcode.org>
Fri, 15 Dec 2006 23:06:22 +0000 (23:06 +0000)
committerslava <slava@factorcode.org>
Fri, 15 Dec 2006 23:06:22 +0000 (23:06 +0000)
commit2111fa223613bc15dbb69f156def97cbdef0716c
treee8e595dc2632bd14c08c78721fc7e7f24c339d5c
parent0cc69c944e4b431d4df53e5de2e016e6a3648901
Fix conflicts
apps/all.factor
libs/httpd/embedded.factor