Marek Kotewicz 6d02c0d392 Merge commit '1a6dbeff6e86d65cae6d7db366cbaa4182eaff7f' into ethereumjs ...

Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.js
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/dist/ethereum.min.js
	libjsqrc/ethereumjs/lib/abi.js

2015-01-15 17:27:07 +01:00

..

balance.html

renamed example/index.html -> example/balance.html

2015-01-06 13:27:43 +01:00

contract.html

web3.contract -> web3.eth.contract

2015-01-13 13:03:40 +01:00

natspec_contract.html

Cleaned up some unused functions

2015-01-14 09:28:52 +01:00

node-app.js

Converted to node module

2014-11-05 19:46:01 +02:00