Branch: refs/heads/intwaddrmgr
Home: https://github.com/btcsuite/btcwallet
Commit: 3cd3bb417f8ffcd14ce7c074f527f19d85403118
https://github.com/btcsuite/btcwallet/commit/3cd3bb417f8ffcd14ce7c074f527f19d85403118
Author: Josh Rickmar <[email protected]>
Date: 2015-02-06 (Fri, 06 Feb 2015)
Changed paths:
M chain/chain.go
M createtx.go
M txstore/json.go
M txstore/serialization.go
M votingpool/pool_test.go
M waddrmgr/manager.go
M wallet.go
Log Message:
-----------
Merge branch 'master' into intwaddrmgr
Conflicts:
btcwallet.go
chain/chain.go
wallet.go
