Merge branch 'master' into develop

pull/150/head
obscuren 10 years ago
commit 2458697dad
  1. 1
      ethutil/script.go
  2. 2
      ethutil/script_windows.go

@ -1,4 +1,5 @@
// +build !windows !cgo
package ethutil
import (

@ -1,3 +1,5 @@
// +build windows, cgo
package ethutil
import (

Loading…
Cancel
Save