From: Doug Coleman <erg@jobim.local>
Date: Thu, 21 May 2009 00:31:23 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~6224^2^2~3
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=dc2791ec45a14a44e4ccde030bf38487be734afc

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

dc2791ec45a14a44e4ccde030bf38487be734afc
diff --cc basis/windows/advapi32/advapi32.factor
index 6e040871f8,1ba08e657b..6d80534e8c
mode 100644,100755..100755
--- a/basis/windows/advapi32/advapi32.factor
+++ b/basis/windows/advapi32/advapi32.factor