web3: updated

dc62fb2e · obscuren · 92c63275 · dc62fb2e · dc62fb2e · f8a43edd
Commit dc62fb2e authored Apr 24, 2015 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

.gitignore .gitignore +0 -2

coin.html cmd/mist/assets/examples/coin.html +1 -2

ethereum.js cmd/mist/assets/ext/ethereum.js +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,6 @@ Godeps/_workspace/bin
 .project
 .settings

-mist
-cmd/mist/mist
 deploy/osx/Mist.app
 deploy/osx/Mist\ Installer.dmg


--- 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-light.min.js"></script>
+<script type="text/javascript" src="../ext/ethereum.js/dist/web3-light.min.js"></script>
 </head>
 <body>

@@ -32,7 +32,6 @@
 </body>

 <script type="text/javascript">
-	var web3 = require('ethereum.js');
 	var eth = web3.eth;

 	web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'));

--- a/ethereum.js @ f8a43edd
+++ b/ethereum.js @ f8a43edd
-Subproject commit c80ede50c3b60a482f1ec76038325ec52f5e73b0
+Subproject commit f8a43eddfb450d0e0ba1669a6916babe0ea43642