]> gitweb.factorcode.org Git - factor.git/commit
Merge git://factorcode.org/git/factor
authorDoug Coleman <erg@jjjj.gateway.2wire.net>
Wed, 30 Jan 2008 18:51:11 +0000 (12:51 -0600)
committerDoug Coleman <erg@jjjj.gateway.2wire.net>
Wed, 30 Jan 2008 18:51:11 +0000 (12:51 -0600)
commiteeade1d2b6f1948c20a0b81a33f755826237bb95
tree366dc5a8beedba2d8848b9fcfd40fde00eedb0e1
parentadc6f4de738a45766c1692484f532aa3461a287e
parentc7d9e5afef4c5309242705ec7ac62630853a0897
Merge git://factorcode.org/git/factor

Conflicts:

extra/hardware-info/windows/nt/nt.factor
extra/hardware-info/windows/windows.factor
extra/hardware-info/windows/nt/nt.factor
extra/hardware-info/windows/windows.factor