UdjinM6 a5ac60b868 Merge remote-tracking branch 'bitcoin/0.12' into HEAD ... + merge fixes + keepass on evhttp		2016-02-06 16:48:04 +03:00
..
Makefile	0.12 dirty merge'n'fix (bitcoin 0.10)	2015-04-04 19:24:37 +03:00
paymentrequestdata.h	Bump copyright headers to 2015	2016-01-05 14:13:33 +01:00
paymentservertests.cpp	Bump copyright headers to 2015	2016-01-05 14:13:33 +01:00
paymentservertests.h	Bump copyright headers to 2015	2016-01-05 14:13:33 +01:00
test_main.cpp	Merge remote-tracking branch 'bitcoin/0.12' into HEAD	2016-02-06 16:48:04 +03:00
uritests.cpp	Merge remote-tracking branch 'bitcoin/0.12' into HEAD	2016-02-06 16:48:04 +03:00
uritests.h	Bump copyright headers to 2015	2016-01-05 14:13:33 +01:00