Merge pull request #1081 from jgarzik/pong
authorJeff Garzik <jgarzik@exmulti.com>
Tue, 17 Apr 2012 15:51:17 +0000 (08:51 -0700)
committerJeff Garzik <jgarzik@exmulti.com>
Tue, 17 Apr 2012 15:51:17 +0000 (08:51 -0700)
BIP 0031: pong message

1  2 
src/main.cpp

diff --cc src/main.cpp
Simple merge