Gav Wood ded221fba2 Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop ...

Conflicts:
	libjsqrc/ethereumjs/.travis.yml
	libjsqrc/ethereumjs/README.md
	libjsqrc/ethereumjs/dist/ethereum.js
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/lib/abi.js
	libjsqrc/ethereumjs/package.json

2015-01-11 17:54:36 +01:00

..

abi.js

Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop

2015-01-11 17:54:36 +01:00

autoprovider.js

fixes for node.js

2015-01-08 15:11:20 +01:00

contract.js

method signature length defined

2015-01-09 13:30:14 +01:00

httprpc.js

bring back todos

2015-01-06 13:32:04 +01:00

qt.js

retabed files

2014-11-11 11:46:46 +01:00

web3.js

default padding changed to 0

2015-01-09 17:27:56 +01:00

websocket.js

module var fix

2015-01-09 12:43:45 +01:00