github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-22 06:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
This commit is contained in:
Luke Dashjr
2012-08-12 17:19:48 +00:00
parent 89c5c381b7 982f4fd301
commit cafa8f2879
26 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/irc.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ void ThreadIRCSeed(void* parg)
void ThreadIRCSeed2(void* parg)
{
/* Dont advertise on IRC if we don't allow incoming connections */
/* Don't advertise on IRC if we don't allow incoming connections */
if (mapArgs.count("-connect") || fNoListen)
return;