steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix conflicts

darcs
slava 2006-12-15 23:06:22 +00:00
parent 0cc69c944e
commit 2111fa2236
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/all.factor
View File

@ -1,9 +1,10 @@
USING: words kernel modules ; USING: words kernel modules ;
REQUIRES: apps/automata apps/benchmarks apps/boids REQUIRES: apps/automata apps/benchmarks apps/boids
apps/factorbot apps/furnace-pastebin apps/hexdump apps/factorbot apps/fjsc-responder apps/furnace-pastebin
apps/lindenmayer apps/mandel apps/raytracer apps/rss apps/hexdump apps/lindenmayer apps/mandel apps/random-tester
apps/space-invaders apps/tetris apps/turing ; apps/raytracer apps/rss apps/space-invaders apps/tetris
apps/turing ;
"x11" vocab [ "x11" vocab [
"apps/factory" require "apps/factory" require

2
libs/httpd/embedded.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2005 Alex Chapman. ! Copyright (C) 2005 Alex Chapman.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
IN: embedded 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: ! if example.fhtml contains:
! <html> ! <html>