From: Joe Groff <arcata@gmail.com>
Date: Mon, 15 Feb 2010 19:50:43 +0000 (-0800)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~4928
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=f06e278e17aa31ad43eef0b10e5fccce43f3181e

Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	basis/tools/deploy/shaker/shaker.factor
---

f06e278e17aa31ad43eef0b10e5fccce43f3181e
diff --cc basis/tools/deploy/shaker/shaker.factor
index f8c3b3b031,1060853343..d8a653c021
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@@ -7,7 -7,7 +7,7 @@@ sequences.private words memory kernel.p
  vocabs.loader system strings sets vectors quotations byte-arrays
  sorting compiler.units definitions generic generic.standard
  generic.single tools.deploy.config combinators classes
--classes.builtin slots.private grouping command-line ;
++classes.builtin slots.private grouping command-line io.pathnames ;
  QUALIFIED: bootstrap.stage2
  QUALIFIED: classes.private
  QUALIFIED: compiler.crossref