| commit | a1dcf2e1087beaf3981739fd2bb74f35ecad630a | |
| author | Pieter Wuille <pieter.wuille@gmail.com> | |
| Sat, 10 Dec 2016 00:22:33 +0000 (9 16:22 -0800) | ||
| committer | Pieter Wuille <pieter.wuille@gmail.com> | |
| Sat, 10 Dec 2016 00:31:03 +0000 (9 16:31 -0800) | ||
| tree | be820fbce936690f57383d2a2329a1b8ccf7d860 | treesnapshot (tar.gz zip) |
| parent | d38b0d7a6b6056cba26999b702815775e2437d87 | commitdiff |
| parent | a874ab5ccf7839edb445830f81591fa608d85fa6 | commitdiff |
Merge #9240: Remove txConflicted
a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos)
bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)
a874ab5 remove internal tracking of mempool conflicts for reporting to wallet (Alex Morcos)
bf663f8 remove external usage of mempool conflict tracking (Alex Morcos)
| src/validation.cpp | diff1 | diff2 | blobhistory |