]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorDoug Coleman <doug.coleman@gmail.com>
Tue, 22 Sep 2009 15:25:42 +0000 (10:25 -0500)
committerDoug Coleman <doug.coleman@gmail.com>
Tue, 22 Sep 2009 15:25:42 +0000 (10:25 -0500)
commit51ddc963b86973afd4c8c3df90700afdb94e6fa3
tree29420c70e3af9abd5c1159abef9ddc3c56abd1bc
parent097b7d338c8de91a244914935c7cb56e2d08196a
parentb0f87fd6a0eea7782137a76b77ad3b515de7eaab
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
core/generic/generic-tests.factor
core/generic/generic-tests.factor