]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorSam Anklesaria <sam@Tintin.local>
Thu, 14 May 2009 01:03:22 +0000 (20:03 -0500)
committerSam Anklesaria <sam@Tintin.local>
Thu, 14 May 2009 01:03:22 +0000 (20:03 -0500)
commitdb76a7b98dad381e231d2713944a477fe91e6682
tree434f034b3de84adfc09f27d0a0afc743f80c6c4d
parent1a8fcee71213f18ad0cfe350c079dee0da0f32bb
parent5bae938c7e43f266e7086f92dc0a5e69ff48b4c2
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
basis/io/launcher/launcher.factor
basis/io/launcher/launcher.factor
basis/ui/gadgets/tables/tables.factor
core/sequences/sequences.factor