diff options
| author | Gavin Andresen <[email protected]> | 2013-10-22 15:34:11 +1000 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-10-22 15:34:11 +1000 |
| commit | 10dc3c74737eea1f2de694c6582caf3027926034 (patch) | |
| tree | be426b48391051c2327577091b95ac6126218871 /src/test/script_tests.cpp | |
| parent | Merge pull request #2929 from Krellan/addrlocal (diff) | |
| parent | Bugfix: Supress "address" key in transaction details, when the destination is... (diff) | |
| download | discoin-10dc3c74737eea1f2de694c6582caf3027926034.tar.xz discoin-10dc3c74737eea1f2de694c6582caf3027926034.zip | |
Merge branch 'bugfix_unknownoutputs' of git://github.com/luke-jr/bitcoin
Conflicts:
src/wallet.cpp
Fixed LogPrint/printf merge conflict.
Diffstat (limited to 'src/test/script_tests.cpp')
0 files changed, 0 insertions, 0 deletions