highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.4.x' into 0.5.0.x

Browse Source 
Conflicts:
	src/keystore.h
This commit is contained in:
Luke Dashjr
2012-04-15 21:05:54 -04:00
parent fdcafa3535 8460185dec
commit 79fc752b61
7 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet.cpp
View File

@@ -547,8 +547,10 @@ void CWalletTx::AddSupportingTransactions(CTxDB& txdb)
vtxPrev.push_back(tx);
if (nDepth < COPY_DEPTH)
{
BOOST_FOREACH(const CTxIn& txin, tx.vin)
vWorkQueue.push_back(txin.prevout.hash);
}
}
}
}