diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
| commit | 5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb (patch) | |
| tree | d5ba6197a8c0c8e36bb92ee9fc8aad717cb2d178 /cmd/mist/main.go | |
| parent | 8393dab470c40678caf36ada82e312d29c4cf5c4 (diff) | |
| parent | 22893b7ac925c49168c119f293ea8befc3aff5cc (diff) | |
| download | go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.gz go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.bz2 go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.lz go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.xz go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.zst go-tangerine-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.zip | |
Merge remote-tracking branch 'upstream/develop' into frontier/js
Conflicts:
cmd/ethereum/js.go
javascript/types.go
Diffstat (limited to 'cmd/mist/main.go')
| -rw-r--r-- | cmd/mist/main.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 887eda59e..1c51233e3 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -29,7 +29,7 @@ import ( "github.com/codegangsta/cli" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/ui/qt/webengine" "github.com/obscuren/qml" @@ -45,7 +45,7 @@ var ( assetPathFlag = cli.StringFlag{ Name: "asset_path", Usage: "absolute path to GUI assets directory", - Value: ethutil.DefaultAssetPath(), + Value: common.DefaultAssetPath(), } ) |