aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/assets
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-04-02 19:39:46 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-04-02 19:39:46 +0800
commit118ad22ee59658ec8ff476999e48d9bffb0c7db6 (patch)
treeb60422477450918993bdce27f22cd45d81952bd8 /cmd/mist/assets
parent81de8ed0912f767b2e3104aaad5c7f31920aaf2a (diff)
parent79828531b1e6a1d5073f45e0e672c54a019de7c0 (diff)
downloaddexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar
dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.gz
dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.bz2
dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.lz
dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.xz
dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.tar.zst
dexon-118ad22ee59658ec8ff476999e48d9bffb0c7db6.zip
Merge branch 'develop' into rpcfabian
Diffstat (limited to 'cmd/mist/assets')
-rw-r--r--cmd/mist/assets/examples/coin.html2
m---------cmd/mist/assets/ext/ethereum.js0
2 files changed, 1 insertions, 1 deletions
diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html
index a15345ab3..0528a5ad0 100644
--- a/cmd/mist/assets/examples/coin.html
+++ b/cmd/mist/assets/examples/coin.html
@@ -3,7 +3,7 @@
<title>JevCoin</title>
<head>
<script type="text/javascript" src="../ext/bignumber.min.js"></script>
-<script type="text/javascript" src="../ext/ethereum.js/dist/ethereum.js"></script>
+<script type="text/javascript" src="../ext/ethereum.js/dist/ethereum-light.min.js"></script>
</head>
<body>
diff --git a/cmd/mist/assets/ext/ethereum.js b/cmd/mist/assets/ext/ethereum.js
-Subproject 2536888f817a1a15b05dab4727d30f73d6763f0
+Subproject 31e046dbecea51d3b99b21f3e7e60ddfb6c3930