]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorDoug Coleman <doug.coleman@gmail.com>
Mon, 21 Sep 2009 04:02:49 +0000 (23:02 -0500)
committerDoug Coleman <doug.coleman@gmail.com>
Mon, 21 Sep 2009 04:02:49 +0000 (23:02 -0500)
commit5cb34724b77f852cfbacd93529348b7314283874
treec38812b77f705690e6b1e6ebd315cbe72e34417a
parenteceed177d6ab6d545eaddad77ffc699fa82f836a
parentf459c24e454057aa921bbb5cef4799a442149d69
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
basis/classes/struct/struct-tests.factor
basis/functors/functors-tests.factor
basis/specialized-arrays/specialized-arrays-tests.factor
basis/classes/struct/struct-tests.factor
basis/functors/functors-tests.factor
basis/specialized-arrays/specialized-arrays-tests.factor
core/syntax/syntax-docs.factor