]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor into regexp
authorDaniel Ehrenberg <littledan@Macintosh-103.(none)>
Tue, 17 Feb 2009 18:24:01 +0000 (12:24 -0600)
committerDaniel Ehrenberg <littledan@Macintosh-103.(none)>
Tue, 17 Feb 2009 18:24:01 +0000 (12:24 -0600)
commit242cfb5c196aae0ef031ee8ee2c04cc7fec1803c
tree2879db78010a4e9880bb980da3d7c25cfc904f63
parent105ef28433925637e257b4e05a7faa7754c61270
parent6e8c86a093e9c301b3c589cd9e9ab99453edf6a3
Merge branch 'master' of git://factorcode.org/git/factor into regexp

Conflicts:

basis/xmode/utilities/utilities-tests.factor
basis/xmode/catalog/catalog.factor
basis/xmode/loader/loader.factor