]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorSam Anklesaria <sam@Tintin.local>
Wed, 22 Jul 2009 15:02:09 +0000 (10:02 -0500)
committerSam Anklesaria <sam@Tintin.local>
Wed, 22 Jul 2009 15:02:09 +0000 (10:02 -0500)
commitcc38d1ada6dc3125ddea9432187d6b0ceceee931
treeac6a0c4655e77da12b7b46b9922e15df2ae76afa
parent58d8aacb74242d0c416b677c7d4a9baa9fcaca38
parent995a96d7e492430c519c008c36297a3eb8c69757
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
basis/functors/functors.factor
basis/io/launcher/launcher.factor
basis/ui/gadgets/tables/tables.factor
basis/functors/functors.factor
basis/ui/gadgets/tables/tables.factor
core/vocabs/parser/parser.factor