diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-09 10:15:23 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-09 10:16:16 +0100 |
| commit | 7f76dda9036e8c9e4bdc29b921fabd7b595ca0c2 (patch) | |
| tree | 1a6fa2c1edc738478c41f469b31dca428ce1b7af /src/qt/paymentrequestplus.h | |
| parent | 4f85383cb31d660e4be442c3bb41539001abd633 (diff) | |
| parent | 5ec654b8ceb4c5f9aafda2b62a0aa6639d738654 (diff) | |
| download | bitcoin-7f76dda9036e8c9e4bdc29b921fabd7b595ca0c2.tar.xz | |
Merge pull request #5216
5ec654b [Qt] update paymentserver license and cleanup ordering (Philip Kaufmann)
4333e26 [Qt] add BIP70 DoS protection test (Philip Kaufmann)
31f8494 [Qt] add BIP70 payment request size DoS protection for URIs (Philip Kaufmann)
2284ccb [Qt] remove dup lock that is done in SetAddressBook() (Philip Kaufmann)
1ec753f [Qt] ensure socket is set to NULL in PaymentServer::ipcSendCommandLine (Philip Kaufmann)
814429d [Qt] add BIP70/BIP71 constants for all messages and mime types (Philip Kaufmann)
b82695b [Qt] make PaymentServer::ipcParseCommandLine void (Philip Kaufmann)
Diffstat (limited to 'src/qt/paymentrequestplus.h')
| -rw-r--r-- | src/qt/paymentrequestplus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index 91c704c520..fbc3a09265 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -1,5 +1,5 @@ -// Copyright (c) 2011-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Copyright (c) 2011-2014 The Bitcoin developers +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H |