Merge branch 'remove-4way' of github.com:jgarzik/bitcoin into tmp
authorJeff Garzik <jeff@garzik.org>
Fri, 6 May 2011 12:04:50 +0000 (08:04 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 6 May 2011 12:04:50 +0000 (08:04 -0400)
commit2fb1124b0fbbc039307f3697d7d550365c21916c
treed4123f999e1c7e44b6f2d299a554d21d0007fa63
parent4408034bcd70032b582e26637a67166df578a8f4
parentb26141e2c5836ccd20bd32a9c653cf2ba5e5b5ee
Merge branch 'remove-4way' of github.com:jgarzik/bitcoin into tmp

Conflicts:
makefile.unix
main.cpp
makefile.unix