Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop

Browse Source

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

...

This commit is contained in:

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

parent 04a57f8c53 b83542c7ee

commit 9067e14819

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available