Commit Graph

4 Commits

Author SHA1 Message Date
Luke Dashjr
e65f25d54e Merge branch '0.6.0.x' into 0.6.x
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/key.h
	src/main.cpp
	src/main.h
	src/net.cpp
2012-07-06 00:54:24 +00:00
xanatos
19920202cc Small fix to rpc_tests 2012-07-05 23:48:49 +00:00
Pieter Wuille
e46704dd90 Expose CRPCTable via bitcoinrpc.h for testing 2012-04-21 01:37:34 +02:00
Gavin Andresen
922e8e2929 Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). 2012-01-13 10:22:23 -05:00