diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
commit | 8828da5f56313855e19f463ff1c09196812b997b (patch) | |
tree | e54e27b1a7d5287bbe245189c3044cc1a19ba02b /src/wallet.cpp | |
parent | ba2db7262bec34d45c75c6842c3a1c0cfaba893e (diff) | |
parent | 4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff) | |
download | bitcoin-8828da5f56313855e19f463ff1c09196812b997b.tar.xz |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r-- | src/wallet.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index d78e470396..30a561dcb4 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -5,7 +5,6 @@ #include "headers.h" #include "db.h" -#include "cryptopp/sha.h" #include "crypter.h" using namespace std; |