diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 00:02:46 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 00:02:46 +0000 |
| commit | 894ce6d88d9ce13ce4be5e473b818311775da0b6 (patch) | |
| tree | 4edb41bc4ce961e2234cc2884afda10dae07ceaa /src/test/rpc_tests.cpp | |
| parent | cfa880f8e32acb38efcfdff75c30c61a6d12cc76 (diff) | |
| parent | 6d7b6681b6cf5d63a8686c99a431ec401c14379f (diff) | |
| download | bitcoin-894ce6d88d9ce13ce4be5e473b818311775da0b6.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/qt/locale/bitcoin_fa.ts
src/qt/locale/bitcoin_lt.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_sv.ts
Diffstat (limited to 'src/test/rpc_tests.cpp')
| -rw-r--r-- | src/test/rpc_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index e6c00e39d8..eb820ade6d 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -17,7 +17,7 @@ createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL) result.push_back(nRequired); Array addresses; if (address1) addresses.push_back(address1); - if (address2) addresses.push_back(address1); + if (address2) addresses.push_back(address2); result.push_back(addresses); return result; } |