diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-15 16:02:13 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-15 16:14:20 +0200 |
commit | bc8535b7175ea4b1bff49fe6bef32017cf5f472a (patch) | |
tree | b119bcad237044214bdbd256875b159f1b884bd5 /src/Makefile.am | |
parent | 9ab7cbffce78da1e6b9ef360a0bc17efa791972d (diff) | |
parent | 6171e494fcd38a4e9a2921e066c10720a74e0ddb (diff) | |
download | bitcoin-bc8535b7175ea4b1bff49fe6bef32017cf5f472a.tar.xz |
Merge pull request #5467
6171e49 [Qt] Use identical strings for expired payment request message (Philip Kaufmann)
06087bd [Qt] minor comment updates in PaymentServer (Philip Kaufmann)
35d1595 [Qt] constify first parameter of processPaymentRequest() (Philip Kaufmann)
9b14aef [Qt] take care of a missing typecast in PaymentRequestPlus::getMerchant() (Philip Kaufmann)
d19ae3c [Qt] remove unused PaymentRequestPlus::getPKIType function (Philip Kaufmann)
6e17a74 [Qt] paymentserver: better logging of invalid certs (Philip Kaufmann)
5a53d7c [Qt] paymentserver: do not log NULL certificates (Philip Kaufmann)
Diffstat (limited to 'src/Makefile.am')
0 files changed, 0 insertions, 0 deletions