Marek Kotewicz 1f5a6f1341 Merge branch 'develop' into cpp ... Conflicts: dist/ethereum.js.map dist/ethereum.min.js		2015-01-27 09:36:39 +01:00
..
balance.html	removed promise dependency, updated readme, fixed node.js version of lib	2015-01-27 00:54:21 +01:00
contract.html	removed promise dependency, updated readme, fixed node.js version of lib	2015-01-27 00:54:21 +01:00
natspec_contract.html	natspec.js updated to use sync api	2015-01-22 15:38:48 +01:00
node-app.js	removed promise dependency, updated readme, fixed node.js version of lib	2015-01-27 00:54:21 +01:00