Marek Kotewicz 534e96da9e Merge branch 'master' of https://github.com/ethereum/ethereum.js ... Conflicts: lib/web3/jsonrpc.js		2015-03-28 14:41:15 +01:00
..
solidity	Use browserify's 'browser' field instead of 'envify' & 'unreachable-branch-transform to', plus always include 'bignumber.js' since it is needed in the browser.	2015-03-16 08:08:29 +00:00
utils	test naming convention	2015-03-25 22:17:35 +01:00
web3	Merge branch 'master' of https://github.com/ethereum/ethereum.js	2015-03-28 14:41:15 +01:00
version.json	version 0.2.0	2015-03-27 14:48:56 +01:00
web3.js	add whisper, network and ethereum version	2015-03-27 11:51:21 +01:00