aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-25 03:37:05 +0800
committerobscuren <geffobscura@gmail.com>2014-09-25 03:37:05 +0800
commit2458697dad8ceac5fe93182e141c7f2eb7428417 (patch)
tree4cfb53aef7b46fa73b566b1360104973b3e553f6
parent5c2aa1d4f56ee02863ec426fe2248700ba58c4ab (diff)
parent206672db5e2fe99892013e80ce4b5fa60ba8a196 (diff)
downloadgo-tangerine-2458697dad8ceac5fe93182e141c7f2eb7428417.tar.gz
go-tangerine-2458697dad8ceac5fe93182e141c7f2eb7428417.tar.zst
go-tangerine-2458697dad8ceac5fe93182e141c7f2eb7428417.zip
Merge branch 'master' into develop
-rw-r--r--ethutil/script.go1
-rw-r--r--ethutil/script_windows.go2
2 files changed, 3 insertions, 0 deletions
diff --git a/ethutil/script.go b/ethutil/script.go
index 34eadff85..8301466cc 100644
--- a/ethutil/script.go
+++ b/ethutil/script.go
@@ -1,4 +1,5 @@
// +build !windows !cgo
+
package ethutil
import (
diff --git a/ethutil/script_windows.go b/ethutil/script_windows.go
index 4f94c6448..c1b2d1b21 100644
--- a/ethutil/script_windows.go
+++ b/ethutil/script_windows.go
@@ -1,3 +1,5 @@
+// +build windows, cgo
+
package ethutil
import (