Merge pull request #5947

author Wladimir J. van der Laan <[email protected]>

Tue, 26 May 2015 08:36:19 +0000 (10:36 +0200)

committer Wladimir J. van der Laan <[email protected]>

Tue, 26 May 2015 08:41:17 +0000 (10:41 +0200)
author Wladimir J. van der Laan <[email protected]>
Tue, 26 May 2015 08:36:19 +0000 (10:36 +0200)
committer Wladimir J. van der Laan <[email protected]>
Tue, 26 May 2015 08:41:17 +0000 (10:41 +0200)
diff --cc src/init.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/main.h
Simple merge
author	Wladimir J. van der Laan <[email protected]>
	Tue, 26 May 2015 08:36:19 +0000 (10:36 +0200)
committer	Wladimir J. van der Laan <[email protected]>
	Tue, 26 May 2015 08:41:17 +0000 (10:41 +0200)
		1	2
src/init.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.h	patch \|	diff1 \|	diff2 \|	blob \| history