diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-04 05:40:29 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-04 05:51:17 -0800 |
| commit | be32b5212b6ab4460080ec5ff55e2bf882259e5e (patch) | |
| tree | 9247f84b6fec039f5dd59c9b3763deb152951b13 /src/alert.cpp | |
| parent | 1dbabb6521a94f6ce635dbda9da2bdd33d892092 (diff) | |
| parent | b4347f60352a7134f95a0f35e74607a167090516 (diff) | |
| download | bitcoin-be32b5212b6ab4460080ec5ff55e2bf882259e5e.tar.xz | |
Merge pull request #5205
b4347f6 minor code style cleanup after recent merges (Philip Kaufmann)
Diffstat (limited to 'src/alert.cpp')
| -rw-r--r-- | src/alert.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alert.cpp b/src/alert.cpp index ce8dfbf507..64399a4260 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -1,14 +1,14 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "alert.h" #include "chainparams.h" #include "clientversion.h" -#include "pubkey.h" #include "net.h" +#include "pubkey.h" #include "timedata.h" #include "ui_interface.h" #include "util.h" |