diff options
| author | Roy Badami <roy@gnomon.org.uk> | 2014-07-07 22:06:21 +0100 |
|---|---|---|
| committer | Roy Badami <roy@gnomon.org.uk> | 2014-07-07 22:06:21 +0100 |
| commit | 96df327834af3b55918adfac9b3f65adfc960b3a (patch) | |
| tree | 8bd199df46ea6f39f7094c0e7db2185b4d3f5d6d /src/qt/test/test_main.cpp | |
| parent | 2e4fee2ac4824570c1340a8f8fe2aed4580de879 (diff) | |
| parent | 1fedd65fcf9ac04b70f0fa8cf6caa9629857d586 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/qt/overviewpage.cpp
src/qt/transactiondesc.cpp
Diffstat (limited to 'src/qt/test/test_main.cpp')
| -rw-r--r-- | src/qt/test/test_main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index a2adb00327..03a2381c06 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,6 +1,5 @@ -#include "bitcoin-config.h" #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "config/bitcoin-config.h" #endif #ifdef ENABLE_WALLET |