Make sure conflicted wallet tx's update balances #7306

Merged
merged 1 commit into from Jan 8, 2016

Conversation

Projects
None yet
5 participants
@morcos
Member

morcos commented Jan 6, 2016

No description provided.

@morcos

This comment has been minimized.

Show comment
Hide comment
@morcos

morcos Jan 6, 2016

Member

@laanwj for 0.12

Member

morcos commented Jan 6, 2016

@laanwj for 0.12

@jonasschnelli jonasschnelli added the Wallet label Jan 7, 2016

@laanwj laanwj added this to the 0.12.0 milestone Jan 7, 2016

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jan 7, 2016

Member

utACK

Member

laanwj commented Jan 7, 2016

utACK

@btcdrak

This comment has been minimized.

Show comment
Hide comment
@btcdrak

btcdrak Jan 8, 2016

Member

utACK

Member

btcdrak commented Jan 8, 2016

utACK

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
Member

MarcoFalke commented Jan 8, 2016

utACK f61766b

@laanwj laanwj merged commit f61766b into bitcoin:master Jan 8, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jan 8, 2016

Merge pull request #7306
f61766b Make sure conflicted wallet tx's update balances (Alex Morcos)

laanwj added a commit that referenced this pull request Jan 8, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment