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

pull/4/head
Shirou WAKAYAMA 11 years ago
commit 03aac12ac8

@ -3,10 +3,11 @@
package gopsutil
import (
"github.com/mitchellh/go-ps"
"os"
"syscall"
"unsafe"
"github.com/shirou/go-ps"
)
var (

@ -4,9 +4,10 @@ package gopsutil
import (
"errors"
"github.com/shirou/w32"
"syscall"
"unsafe"
"github.com/shirou/w32"
)
const (

Loading…
Cancel
Save