]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Fri, 18 Apr 2008 04:20:17 +0000 (23:20 -0500)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Fri, 18 Apr 2008 04:20:17 +0000 (23:20 -0500)
commit3ac49319695d555ae329f0d6f9f7ba88cd882d2a
treeb3aefcbb547dcb2e0081ba52d9fa12e5875ba703
parent4823509dfd2c0b0ce153e6d8a497977e0fd7a86e
parent6fb437c6d529d332b839f5360804adf8226e06e3
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

extra/delegate/delegate-tests.factor
extra/delegate/delegate.factor
extra/delegate/delegate-tests.factor
extra/delegate/delegate.factor