Merge branch 'master' of github.com:shirou/gopsutil

11 years ago · 03aac12ac8
parent d4af853802 91ef0f989f
commit 03aac12ac8
2 changed files with 4 additions and 2 deletions
--- a/host_windows.go
+++ b/host_windows.go
@ -3,10 +3,11 @@
 package gopsutil
 import (
 	"github.com/mitchellh/go-ps"
 	"os"
 	"syscall"
 	"unsafe"
 	"github.com/shirou/go-ps"
 )
 var (
--- a/process_windows.go
+++ b/process_windows.go
@ -4,9 +4,10 @@ package gopsutil
 import (
 	"errors"
 	"github.com/shirou/w32"
 	"syscall"
 	"unsafe"
 	"github.com/shirou/w32"
 )
 const (