diff options
| author | Roy Badami <[email protected]> | 2014-07-07 22:06:21 +0100 |
|---|---|---|
| committer | Roy Badami <[email protected]> | 2014-07-07 22:06:21 +0100 |
| commit | 96df327834af3b55918adfac9b3f65adfc960b3a (patch) | |
| tree | 8bd199df46ea6f39f7094c0e7db2185b4d3f5d6d /src/alert.cpp | |
| parent | Show bitcoin quantities with full precision, even in the presence of trailing... (diff) | |
| parent | Merge pull request #4480 (diff) | |
| download | discoin-96df327834af3b55918adfac9b3f65adfc960b3a.tar.xz discoin-96df327834af3b55918adfac9b3f65adfc960b3a.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/qt/overviewpage.cpp
src/qt/transactiondesc.cpp
Diffstat (limited to 'src/alert.cpp')
| -rw-r--r-- | src/alert.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/alert.cpp b/src/alert.cpp index 99164d63e..258a2b52c 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -5,8 +5,10 @@ #include "alert.h" +#include "chainparams.h" #include "key.h" #include "net.h" +#include "timedata.h" #include "ui_interface.h" #include "util.h" |