Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts: src/script.cpp
2011-07-27 21:44:55 +02:00
parent 7df001be94 a139ed74f2
commit b5b1d1a66b
6 changed files with 28 additions and 21 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -437,7 +437,7 @@ void CWalletTx::GetAmounts(int64& nGeneratedImmature, int64& nGeneratedMature, l
    {
        CBitcoinAddress address;
        vector<unsigned char> vchPubKey;
-        if (!ExtractAddress(txout.scriptPubKey, pwallet, address))
+        if (!ExtractAddress(txout.scriptPubKey, NULL, address))
        {
            printf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
                   this->GetHash().ToString().c_str());