aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-02-15 07:05:04 +0800
committerobscuren <geffobscura@gmail.com>2014-02-15 07:05:04 +0800
commitfe59a2b26deb11705c524dc52dc78ce1e00eb713 (patch)
tree509838a2a8d46a0acf68f5577cad128aab942f44
parent68fbfe70dadd1e63baff6ecf5b59e4c9ba0eb2ca (diff)
downloadgo-tangerine-fe59a2b26deb11705c524dc52dc78ce1e00eb713.tar.gz
go-tangerine-fe59a2b26deb11705c524dc52dc78ce1e00eb713.tar.zst
go-tangerine-fe59a2b26deb11705c524dc52dc78ce1e00eb713.zip
Updated to the great merge package
-rw-r--r--README.md2
-rw-r--r--dev_console.go8
-rw-r--r--ethereum.go4
3 files changed, 7 insertions, 7 deletions
diff --git a/README.md b/README.md
index 1cf3e1b04..4deaf4579 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Ethereum
Ethereum Go developer client (c) Jeffrey Wilcke
Ethereum is currently in its testing phase. The current state is "Proof
-of Concept 1". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Edge).
+of Concept 2". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Edge).
Ethereum Go is split up in several sub packages Please refer to each
individual package for more information.
diff --git a/dev_console.go b/dev_console.go
index d3635986b..ff2539b03 100644
--- a/dev_console.go
+++ b/dev_console.go
@@ -6,10 +6,10 @@ import (
"errors"
"fmt"
"github.com/ethereum/eth-go"
- "github.com/ethereum/ethchain-go"
- "github.com/ethereum/ethdb-go"
- "github.com/ethereum/ethutil-go"
- "github.com/ethereum/ethwire-go"
+ "github.com/ethereum/eth-go/ethchain"
+ "github.com/ethereum/eth-go/ethdb"
+ "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/eth-go/ethwire"
_ "math/big"
"os"
"strings"
diff --git a/ethereum.go b/ethereum.go
index 51a2783ad..9907de740 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -3,8 +3,8 @@ package main
import (
"fmt"
"github.com/ethereum/eth-go"
- "github.com/ethereum/ethchain-go"
- "github.com/ethereum/ethutil-go"
+ "github.com/ethereum/eth-go/ethchain"
+ "github.com/ethereum/eth-go/ethutil"
"github.com/obscuren/secp256k1-go"
"log"
"os"