Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

2014-10-27 11:50:50 +01:00
parent b095bd3237 f62b6742f2
commit 797b93c98c
21 changed files with 3019 additions and 0 deletions
--- a/ethutil/script_unix.go
+++ b/ethutil/script_unix.go
@ -1,3 +1,5 @@
+// +build !windows
+
 package ethutil

 import (
--- a/ethutil/script_windows.go
+++ b/ethutil/script_windows.go
@ -1,3 +1,5 @@
+// +build windows
+
 package ethutil

 import (