diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-02-05 09:18:52 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-02-05 09:18:52 +0800 |
| commit | 74e509acd282f658a4e2d6f7ae0f4175474304ef (patch) | |
| tree | 8e053afecae1ea247cd5db795a5db795960e15ec /state.cpp | |
| parent | 952e25ac674d2a1d1afd0dbd197a0a8979a6dd64 (diff) | |
| parent | 969366f46b83c57461fc5399fff76bd07738b6f2 (diff) | |
| download | dexon-solidity-74e509acd282f658a4e2d6f7ae0f4175474304ef.tar dexon-solidity-74e509acd282f658a4e2d6f7ae0f4175474304ef.tar.gz dexon-solidity-74e509acd282f658a4e2d6f7ae0f4175474304ef.tar.bz2 dexon-solidity-74e509acd282f658a4e2d6f7ae0f4175474304ef.tar.lz dexon-solidity-74e509acd282f658a4e2d6f7ae0f4175474304ef.tar.xz dexon-solidity-74e509acd282f658a4e2d6f7ae0f4175474304ef.tar.zst dexon-solidity-74e509acd282f658a4e2d6f7ae0f4175474304ef.zip | |
Merge branch 'develop' into p2p
Conflicts:
libp2p/Host.cpp
Diffstat (limited to 'state.cpp')
| -rw-r--r-- | state.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -24,7 +24,7 @@ #include <boost/test/unit_test.hpp> #include "JsonSpiritHeaders.h" #include <libdevcore/CommonIO.h> -#include <libethereum/BlockChain.h> +#include <libethereum/CanonBlockChain.h> #include <libethereum/State.h> #include <libethereum/ExtVM.h> #include <libethereum/Defaults.h> |