]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Tue, 12 Feb 2008 00:41:34 +0000 (18:41 -0600)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Tue, 12 Feb 2008 00:41:34 +0000 (18:41 -0600)
commit6832c634a11ff2ca31af75e7692e45bfb6e27299
tree61d72007216f9614089f7edefd64bece60669822
parentb08907ef2737c942cf3953ba83ac4ccf5eb47621
parent36d1cae83e4bb128e10e9ce914914b63f716c467
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

extra/multiline/multiline.factor
extra/multiline/multiline.factor