aboutsummaryrefslogtreecommitdiff
path: root/src/qt/paymentrequestplus.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-12-09 10:15:23 +0100
committerWladimir J. van der Laan <[email protected]>2014-12-09 10:16:16 +0100
commit7f76dda9036e8c9e4bdc29b921fabd7b595ca0c2 (patch)
tree1a6fa2c1edc738478c41f469b31dca428ce1b7af /src/qt/paymentrequestplus.cpp
parentMerge pull request #5409 (diff)
parent[Qt] update paymentserver license and cleanup ordering (diff)
downloaddiscoin-7f76dda9036e8c9e4bdc29b921fabd7b595ca0c2.tar.xz
discoin-7f76dda9036e8c9e4bdc29b921fabd7b595ca0c2.zip
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.cpp')
-rw-r--r--src/qt/paymentrequestplus.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
index 7aefffe24..a40b5bbcd 100644
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -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.
//