Merge branch 'master' into develop

2458697d · obscuren · 5c2aa1d4 · 206672db · 2458697d · 2458697d
Commit 2458697d authored Sep 24, 2014 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

script.go ethutil/script.go +1 -0

script_windows.go ethutil/script_windows.go +2 -0

No files found.
--- a/ethutil/script.go
+++ b/ethutil/script.go
 // +build !windows !cgo
+
 package ethutil

 import (

--- a/ethutil/script_windows.go
+++ b/ethutil/script_windows.go
+// +build windows, cgo
+
 package ethutil

 import (