From: Daniel Ehrenberg <ehrenbed@carleton.edu>
Date: Tue, 18 Mar 2008 21:02:48 +0000 (-0400)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.94~3738^2~8^2~9
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=d496065f89abf5f6ee6720544efa15aa55f14c7f

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

d496065f89abf5f6ee6720544efa15aa55f14c7f
diff --cc extra/io/unix/launcher/launcher-tests.factor
index 5370817d2f,6fa8c913aa..9e19245d01
mode 100644,100755..100755
--- a/extra/io/unix/launcher/launcher-tests.factor
+++ b/extra/io/unix/launcher/launcher-tests.factor