Marek Kotewicz fbb9a41bec Merge branch 'develop' into icap ...

Conflicts:
	dist/web3-light.js
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js

2015-05-26 20:48:04 +02:00

..

browser-bn.js

fixes for go otto env

2015-03-23 17:56:57 +01:00

browser-xhr.js

fix for otto

2015-03-23 18:10:07 +01:00

config.js

web3.eth.defaultAccount property, updated event_inc example, fixed #96

2015-04-20 14:16:29 +02:00

sha3.js

sha3 backward compatibility. #205

2015-05-26 20:47:04 +02:00

utils.js

icap.html example

2015-05-19 15:17:02 +02:00