]> gitweb.factorcode.org Git - factor.git/commit
Merge git://factorcode.org/git/factor
authorDoug Coleman <doug.coleman@gmail.com>
Wed, 6 Feb 2008 04:48:44 +0000 (22:48 -0600)
committerDoug Coleman <doug.coleman@gmail.com>
Wed, 6 Feb 2008 04:48:44 +0000 (22:48 -0600)
commit8d3ac25553f16a1aa801194d7026437a72f5c33a
tree0b6ecca0c5a987cb49d0e371c4fa240513280ea5
parent56b8ca4a4b0c64b12878d025efc18dba9627b508
parent1eda70f1ad1f0d744ed846ce8c975a1cd4b28fb6
Merge git://factorcode.org/git/factor

Conflicts:

Makefile
Makefile
vm/os-windows-nt.c