diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-03-29 09:54:00 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-03-29 09:54:00 +0100 |
| commit | a6d32c94ab91e84fc359e9b97561ae9da06c1abc (patch) | |
| tree | b798ce036531c979d47d6f78ff596afaeffc706d /src/qt/askpassphrasedialog.cpp | |
| parent | 1be4bbadc74d9fa8f987f91df973733c6fef7a56 (diff) | |
| parent | 67155d9299ef75cc73272a259dbfbf72632c3020 (diff) | |
| download | bitcoin-a6d32c94ab91e84fc359e9b97561ae9da06c1abc.tar.xz | |
Merge remote-tracking branch 'codeshark/multiwallet-qt-no-core' (pull #2220)
Conflicts:
src/qt/bitcoingui.cpp
Diffstat (limited to 'src/qt/askpassphrasedialog.cpp')
0 files changed, 0 insertions, 0 deletions