diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-11-16 09:01:19 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-11-16 09:33:10 +0100 |
| commit | 3c098a8aa0780009c11b66b1a5d488a928629ebf (patch) | |
| tree | 9199f290ff331a5f8bc1d2ba1a29e9fd236eefe3 /src/script/script_error.cpp | |
| parent | Merge #11686: Make ISSUE_TEMPLATE a bit shorter, mention hardware tests (diff) | |
| parent | Remove trailing whitespace causing travis failure (diff) | |
| download | discoin-3c098a8aa0780009c11b66b1a5d488a928629ebf.tar.xz discoin-3c098a8aa0780009c11b66b1a5d488a928629ebf.zip | |
Merge #11651: refactor: Make all #includes relative to project root (laanwj, MeshCollider, ryanofsky)
7b91b5f Remove trailing whitespace causing travis failure (MeshCollider)
434f5a2 Recommend #include<> syntax in developer notes (Russell Yanofsky)
96b9281 refactor: Include obj/build.h instead of build.h (Wladimir J. van der Laan)
138016b test: refactor: Use absolute include paths for test data files (Wladimir J. van der Laan)
e7b3163 qt: refactor: Changes to make include paths absolute (Wladimir J. van der Laan)
0c71521 build: Remove -I for everything but project root (Wladimir J. van der Laan)
5b56ec9 qt: refactor: Use absolute include paths in .ui files (Wladimir J. van der Laan)
1a44534 scripted-diff: Replace #include "" with #include <> (ryanofsky) (MeshCollider)
Pull request description:
Rebase of #11053
Previously started by @laanwj, ACK'ed by promag, ryanofsky, jonasschnelli, and concept-ACK'ed by practicalswift and jnewbery. Thus should be almost RTM :)
Tree-SHA512: d8d25248309deb06a54686c4a6bafd290ba69dcd0df391a50d1caed2c22ff2659be442459bdd9d1fc3b6a1360ba0804a907b1402d206df3e1cb6e8924e3c7f3e
Diffstat (limited to 'src/script/script_error.cpp')
| -rw-r--r-- | src/script/script_error.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index 6c590f53e..32aa639ac 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "script_error.h" +#include <script/script_error.h> const char* ScriptErrorString(const ScriptError serror) { |