diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-25 03:37:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-25 03:37:05 +0800 |
| commit | 2458697dad8ceac5fe93182e141c7f2eb7428417 (patch) | |
| tree | 4cfb53aef7b46fa73b566b1360104973b3e553f6 | |
| parent | 5c2aa1d4f56ee02863ec426fe2248700ba58c4ab (diff) | |
| parent | 206672db5e2fe99892013e80ce4b5fa60ba8a196 (diff) | |
| download | dexon-2458697dad8ceac5fe93182e141c7f2eb7428417.tar dexon-2458697dad8ceac5fe93182e141c7f2eb7428417.tar.gz dexon-2458697dad8ceac5fe93182e141c7f2eb7428417.tar.bz2 dexon-2458697dad8ceac5fe93182e141c7f2eb7428417.tar.lz dexon-2458697dad8ceac5fe93182e141c7f2eb7428417.tar.xz dexon-2458697dad8ceac5fe93182e141c7f2eb7428417.tar.zst dexon-2458697dad8ceac5fe93182e141c7f2eb7428417.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | ethutil/script.go | 1 | ||||
| -rw-r--r-- | ethutil/script_windows.go | 2 |
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 ( |