Merge remote-tracking branch 'ethereum/conversion' into conversion

JoeQian · Mar 20, 2015 · 28ddc16 · 28ddc16
2 parents c161d73 + 01ff0b3
commit 28ddc16
Show file tree

Hide file tree

Showing 37 changed files with 5,474 additions and 1,728 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/js/cache_sizes.js b/Godeps/_workspace/src/github.com/ethereum/ethash/js/cache_sizes.js
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/js/dag_sizes.js b/Godeps/_workspace/src/github.com/ethereum/ethash/js/dag_sizes.js