]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Fri, 4 Apr 2008 00:20:29 +0000 (19:20 -0500)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Fri, 4 Apr 2008 00:20:29 +0000 (19:20 -0500)
commit4e1285112d79d3ca5738a34b5ed9e2606057a22e
tree69ca56fc8ed62d2673a751f712ae79e31abc7519
parent90d4266867eb6af40590f1b05208b1db29aa763a
parent653bc1cd80819cbfb81f2082a8240cfda7a54ab7
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

extra/delegate/delegate.factor
extra/delegate/delegate.factor