aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-10-16 22:39:42 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-10-16 22:39:42 +0800
commitc5ef2afda56c069fda5528c48bd3d831b81455dc (patch)
tree7904f58334b7098973230e495bc93ebe531da9ac
parentd5327ddc5fdc2a8b967699ea06ef5b5503657123 (diff)
parentd5f56ad5c5dcdc393da46c5bfab1274e1596697d (diff)
downloadgo-tangerine-c5ef2afda56c069fda5528c48bd3d831b81455dc.tar
go-tangerine-c5ef2afda56c069fda5528c48bd3d831b81455dc.tar.gz
go-tangerine-c5ef2afda56c069fda5528c48bd3d831b81455dc.tar.bz2
go-tangerine-c5ef2afda56c069fda5528c48bd3d831b81455dc.tar.lz
go-tangerine-c5ef2afda56c069fda5528c48bd3d831b81455dc.tar.xz
go-tangerine-c5ef2afda56c069fda5528c48bd3d831b81455dc.tar.zst
go-tangerine-c5ef2afda56c069fda5528c48bd3d831b81455dc.zip
Merge pull request #1907 from Gustav-Simonsson/ethash_godep
godeps: update ethash following GPU miner merge
-rw-r--r--Godeps/Godeps.json4
-rw-r--r--Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go18
-rw-r--r--Godeps/_workspace/src/github.com/ethereum/ethash/ethash_test.go17
-rw-r--r--Godeps/_workspace/src/github.com/ethereum/ethash/ethashc.go16
4 files changed, 53 insertions, 2 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 01bda12bf..ee77a1c76 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -16,8 +16,8 @@
},
{
"ImportPath": "github.com/ethereum/ethash",
- "Comment": "v23.1-235-gb39e007",
- "Rev": "b39e007d393ab5945b4c0748a7415b7e31c5db04"
+ "Comment": "v23.1-238-g9401881",
+ "Rev": "9401881ab040d1a3b0ae9e4780a115bc284a8a1a"
},
{
"ImportPath": "github.com/fatih/color",
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
index ddb8ba583..2199dbec1 100644
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
@@ -1,3 +1,21 @@
+// Copyright 2015 The go-ethereum Authors
+// Copyright 2015 Lefteris Karapetsas <lefteris@refu.co>
+// Copyright 2015 Matthew Wampler-Doty <matthew.wampler.doty@gmail.com>
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package ethash
/*
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_test.go b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_test.go
index c19e45d1d..e0ca0bd85 100644
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_test.go
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash_test.go
@@ -1,3 +1,20 @@
+// Copyright 2015 The go-ethereum Authors
+// Copyright 2015 Lefteris Karapetsas <lefteris@refu.co>
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package ethash
import (
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethashc.go b/Godeps/_workspace/src/github.com/ethereum/ethash/ethashc.go
index 8a441525d..1d2ba1613 100644
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/ethashc.go
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/ethashc.go
@@ -1,3 +1,19 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package ethash
/*