merge

2015-02-13 15:05:56 +01:00
parent db24fb792c 38faf2c51a
commit a5ea21cd85
311 changed files with 24905 additions and 8718 deletions
@@ -8,9 +8,9 @@ import (
 	"net"
 	"os"

+	"github.com/ethereum/go-ethereum/crypto/secp256k1"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/obscuren/secp256k1-go"
 )

 func main() {