diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:05:43 -0400 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-22 10:05:43 -0400 |
commit | a93ab877877925c60b2dbf56bdde8aa46b6b7391 (patch) | |
tree | 3c473dd4151e38a72763600839a16f4a3b509325 /src/net.h | |
parent | e401e5eb79f944bf772e541baed9ef45f0cb4f43 (diff) | |
parent | d0fe14ffecda4af98ffe7b1523f9a903bf7518a0 (diff) | |
download | bitcoin-a93ab877877925c60b2dbf56bdde8aa46b6b7391.tar.xz |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/net.h')
-rw-r--r-- | src/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -111,7 +111,7 @@ public: int64 nLastRecv; int64 nLastSendEmpty; int64 nTimeConnected; - unsigned int nHeaderStart; + signed int nHeaderStart; unsigned int nMessageStart; CAddress addr; int nVersion; |