Merge pull request #707 from gavinandresen/BIP14
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 19 Dec 2011 15:25:16 +0000 (07:25 -0800)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 19 Dec 2011 15:25:16 +0000 (07:25 -0800)
Implement BIP 14 : separate protocol version from client version

1  2 
src/net.cpp
src/util.h

diff --cc src/net.cpp
Simple merge
diff --cc src/util.h
Simple merge