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

Merge branch '0.4.x' into 0.5.x

Browse Source 
Conflicts:
	src/main.cpp
This commit is contained in:
Luke Dashjr
2012-04-22 10:05:43 -04:00
parent e401e5eb79 d0fe14ffec
commit a93ab87787
16 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/base58.h
View File

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