]> gitweb.factorcode.org Git - factor.git/commitdiff
projects / factor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0cc69c9)
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)
apps/all.factor patch | blob | history
libs/httpd/embedded.factor patch | blob | history

diff --git a/apps/all.factor b/apps/all.factor
index 858ee9857aa2b1a995c54562080f3ebadbb21bfa..8fb0ca6332520bb4a748683311f1b74195245c2b 100644 (file)
--- a/apps/all.factor
+++ b/apps/all.factor
@@ -1,9 +1,10 @@
 USING: words kernel modules ;
 
 REQUIRES: apps/automata apps/benchmarks apps/boids
-apps/factorbot apps/furnace-pastebin apps/hexdump
-apps/lindenmayer apps/mandel apps/raytracer apps/rss
-apps/space-invaders apps/tetris apps/turing ;
+apps/factorbot apps/fjsc-responder apps/furnace-pastebin 
+apps/hexdump apps/lindenmayer apps/mandel apps/random-tester
+apps/raytracer apps/rss apps/space-invaders apps/tetris
+apps/turing ;
 
 "x11" vocab [
     "apps/factory" require
diff --git a/libs/httpd/embedded.factor b/libs/httpd/embedded.factor
index bb8edf314ebe1daa8091a3619675041d23cc6dd9..e08b9ea4fda07aabe4573f2f57fc6e3586dbb92d 100644 (file)
--- a/libs/httpd/embedded.factor
+++ b/libs/httpd/embedded.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005 Alex Chapman.
 ! See http://factorcode.org/license.txt for BSD license.
 IN: embedded
-USING: sequences kernel parser math namespaces io html test ;
+USING: sequences kernel parser math namespaces io html test errors ;
 
 ! if example.fhtml contains:
 ! <html>
Factor programming language