From fe59a2b26deb11705c524dc52dc78ce1e00eb713 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 15 Feb 2014 00:05:04 +0100
Subject: Updated to the great merge package

---
 README.md      | 2 +-
 dev_console.go | 8 ++++----
 ethereum.go    | 4 ++--
 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"
-- 
cgit