Merge commit 'a1023a5dffee7c06e8b75a21f5c9b8826e820942' into develop

Conflicts: libjsqrc/ethereumjs/dist/ethereum.js.map
2015-01-11 18:18:05 +01:00 · 2015-01-11 18:18:05 +01:00 · 9a9987aeed
parent 5582901ca5 ab745d3b0e
commit 9a9987aeed
3 changed files with 4 additions and 2 deletions
--- a/dist/ethereum.js
+++ b/dist/ethereum.js
@ -289,6 +289,7 @@ module.exports = {
    methodSignature: methodSignature
 };

+
 },{}],2:[function(require,module,exports){
 /*
    This file is part of ethereum.js.
--- a/dist/ethereum.js.map
+++ b/dist/ethereum.js.map
--- a/lib/abi.js
+++ b/lib/abi.js
@ -287,3 +287,4 @@ module.exports = {
    outputParser: outputParser,
    methodSignature: methodSignature
 };
+