highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-09 14:18:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/main.h
	src/net.cpp
	src/util.cpp
This commit is contained in:
Luke Dashjr
2012-04-22 10:07:24 -04:00
parent c43a9ea77d a93ab87787
commit 66116c3847
12 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/base58.h
View File

@@ -288,7 +288,7 @@ public:
bool IsValid() const
{
int nExpectedSize = 20;
unsigned int nExpectedSize = 20;
bool fExpectTestNet = false;
switch(nVersion)
{