Merge pull request ethereum#6 from expanse-project/rebase-1.2.1

Rebase 1.2.2
rewrewby · Oct 13, 2015 · 7df403e · 7df403e
2 parents aba7b81 + dfcf6fe
commit 7df403e
Show file tree

Hide file tree

Showing 876 changed files with 29,753 additions and 4,914 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
-
+tests/files/VMTests/RandomTests/*
 /tmp
 */**/*un~
 */**/*.test

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "cmd/mist/assets/ext/expanse.js"]
 	path = cmd/mist/assets/ext/expanse.js
-	url = https://github.com/expanse-project/web3.js
+	url = https://github.com/expanse-org/web3.js
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/expanse-project/ethash/src/libethash/endian.h b/Godeps/_workspace/src/github.com/expanse-project/ethash/src/libethash/endian.h
diff --git a/Godeps/_workspace/src/github.com/expanse-project/ethash/src/libethash/fnv.h b/Godeps/_workspace/src/github.com/expanse-project/ethash/src/libethash/fnv.h
diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/LICENSE b/Godeps/_workspace/src/github.com/mattn/go-isatty/LICENSE
diff --git a/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go b/Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS b/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS
diff --git a/...rc/code.google.com/p/go-uuid/uuid/LICENSE → ...space/src/github.com/pborman/uuid/LICENSE b/...rc/code.google.com/p/go-uuid/uuid/LICENSE → ...space/src/github.com/pborman/uuid/LICENSE
diff --git a/...src/code.google.com/p/go-uuid/uuid/dce.go → ...kspace/src/github.com/pborman/uuid/dce.go b/...src/code.google.com/p/go-uuid/uuid/dce.go → ...kspace/src/github.com/pborman/uuid/dce.go
diff --git a/...src/code.google.com/p/go-uuid/uuid/doc.go → ...kspace/src/github.com/pborman/uuid/doc.go b/...src/code.google.com/p/go-uuid/uuid/doc.go → ...kspace/src/github.com/pborman/uuid/doc.go
diff --git a/...rc/code.google.com/p/go-uuid/uuid/hash.go → ...space/src/github.com/pborman/uuid/hash.go b/...rc/code.google.com/p/go-uuid/uuid/hash.go → ...space/src/github.com/pborman/uuid/hash.go
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/json.go b/Godeps/_workspace/src/github.com/pborman/uuid/json.go
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/json_test.go b/Godeps/_workspace/src/github.com/pborman/uuid/json_test.go
diff --git a/...rc/code.google.com/p/go-uuid/uuid/node.go → ...space/src/github.com/pborman/uuid/node.go b/...rc/code.google.com/p/go-uuid/uuid/node.go → ...space/src/github.com/pborman/uuid/node.go
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/seq_test.go b/Godeps/_workspace/src/github.com/pborman/uuid/seq_test.go
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/sql.go b/Godeps/_workspace/src/github.com/pborman/uuid/sql.go
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/sql_test.go b/Godeps/_workspace/src/github.com/pborman/uuid/sql_test.go
diff --git a/...rc/code.google.com/p/go-uuid/uuid/time.go → ...space/src/github.com/pborman/uuid/time.go b/...rc/code.google.com/p/go-uuid/uuid/time.go → ...space/src/github.com/pborman/uuid/time.go
diff --git a/...rc/code.google.com/p/go-uuid/uuid/util.go → ...space/src/github.com/pborman/uuid/util.go b/...rc/code.google.com/p/go-uuid/uuid/util.go → ...space/src/github.com/pborman/uuid/util.go
diff --git a/...rc/code.google.com/p/go-uuid/uuid/uuid.go → ...space/src/github.com/pborman/uuid/uuid.go b/...rc/code.google.com/p/go-uuid/uuid/uuid.go → ...space/src/github.com/pborman/uuid/uuid.go
diff --git a/...de.google.com/p/go-uuid/uuid/uuid_test.go → .../src/github.com/pborman/uuid/uuid_test.go b/...de.google.com/p/go-uuid/uuid/uuid_test.go → .../src/github.com/pborman/uuid/uuid_test.go
diff --git a/...ode.google.com/p/go-uuid/uuid/version1.go → ...e/src/github.com/pborman/uuid/version1.go b/...ode.google.com/p/go-uuid/uuid/version1.go → ...e/src/github.com/pborman/uuid/version1.go
diff --git a/...ode.google.com/p/go-uuid/uuid/version4.go → ...e/src/github.com/pborman/uuid/version4.go b/...ode.google.com/p/go-uuid/uuid/version4.go → ...e/src/github.com/pborman/uuid/version4.go