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

Merge branch '0.6.0.x' into 0.6.x

Browse Source 
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/key.h
	src/main.cpp
	src/main.h
	src/net.cpp
This commit is contained in:
Luke Dashjr
2012-07-06 00:54:24 +00:00
parent 33a656c4ae 7083cc3083
commit e65f25d54e
29 changed files with 130 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util.cpp
+2 -2
View File
@@ -994,7 +994,7 @@ void ShrinkDebugFile()
// "Never go to sea with two chronometers; take one or three."
// Our three time sources are:
// - System clock
// - Median of other nodes's clocks
// - Median of other nodes clocks
// - The user (asking the user to fix the system clock if the first two disagree)
//
static int64 nMockTime = 0; // For unit testing
@@ -1257,7 +1257,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) { return false; }
// --> may result in deadlock between the two threads, depending on when they run.
// Solution implemented here:
// Keep track of pairs of locks: (A before B), (A before C), etc.
// Complain if any thread trys to lock in a different order.
// Complain if any thread tries to lock in a different order.
//
struct CLockLocation