highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-28 18:19:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/main.cpp
	src/serialize.h
This commit is contained in:
Luke Dashjr
2012-05-04 18:57:03 +00:00
parent 6c055e506d b2e5f797b5
commit a1a5a89063
5 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/util.cpp
View File

@@ -237,7 +237,7 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
*pend = '\0';
char* p1 = pszBuffer;
char* p2;
while (p2 = strchr(p1, '\n'))
while ((p2 = strchr(p1, '\n')))
{
p2++;
char c = *p2;