HomePhabricator

Merge branch 'bugfix_unknownoutputs' of git://github.com/luke-jr/bitcoin
10dc3c74737eUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'bugfix_unknownoutputs' of git://github.com/luke-jr/bitcoin

Conflicts:
src/wallet.cpp
Fixed LogPrint/printf merge conflict.

Event Timeline

Gavin Andresen <gavinandresen@gmail.com> committed rABC10dc3c74737e: Merge branch 'bugfix_unknownoutputs' of git://github.com/luke-jr/bitcoin (authored by Gavin Andresen <gavinandresen@gmail.com>).Oct 22 2013, 05:34