diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-02-13 00:35:00 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-02-13 00:35:00 +0800 |
| commit | e332dfa147db4f838b52dfc9e491682981cf1e23 (patch) | |
| tree | 21d12d8d2412eb75024a26f4bd556d6e2af88620 /SolidityABIJSON.cpp | |
| parent | ca39f95248b8626e6239f852c259a93148bbe7da (diff) | |
| parent | 1f6198a9ae6c67061d897d67a0d40a1c1806fdec (diff) | |
| download | dexon-solidity-e332dfa147db4f838b52dfc9e491682981cf1e23.tar.gz dexon-solidity-e332dfa147db4f838b52dfc9e491682981cf1e23.tar.zst dexon-solidity-e332dfa147db4f838b52dfc9e491682981cf1e23.zip | |
Merge branch 'develop' into p2p
Conflicts:
eth/main.cpp
libwebthree/WebThree.cpp
libwebthree/WebThree.h
neth/main.cpp
Diffstat (limited to 'SolidityABIJSON.cpp')
| -rw-r--r-- | SolidityABIJSON.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SolidityABIJSON.cpp b/SolidityABIJSON.cpp index 242a88e7..10873b5a 100644 --- a/SolidityABIJSON.cpp +++ b/SolidityABIJSON.cpp @@ -22,7 +22,7 @@ #include <boost/test/unit_test.hpp> #include <libsolidity/CompilerStack.h> -#include <jsoncpp/json/json.h> +#include <json/json.h> #include <libdevcore/Exceptions.h> namespace dev |