Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoi...

author Gavin Andresen <gavinandresen@gmail.com>

Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)

committer Gavin Andresen <gavinandresen@gmail.com>

Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)
author Gavin Andresen <gavinandresen@gmail.com>
Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)
committer Gavin Andresen <gavinandresen@gmail.com>
Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)
diff --cc src/main.cpp
Simple merge
diff --cc src/main.h
Simple merge
diff --cc src/rpc.cpp
Simple merge
author	Gavin Andresen <gavinandresen@gmail.com>
	Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)
committer	Gavin Andresen <gavinandresen@gmail.com>
	Wed, 7 Sep 2011 14:51:57 +0000 (10:51 -0400)
		1	2
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rpc.cpp	patch \|	diff1 \|	diff2 \|	blob \| history