Merge branch 'master' into develop

2014-09-24 21:37:05 +02:00 · 2014-09-24 21:37:05 +02:00 · 2458697dad
parent 5c2aa1d4f5 206672db5e
commit 2458697dad
2 changed files with 3 additions and 0 deletions
--- a/ethutil/script.go
+++ b/ethutil/script.go
@ -1,4 +1,5 @@
 // +build !windows !cgo
+
 package ethutil

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

 import (