Merge branch 'master' into Dependencies
Merge with upstream
This commit is contained in:
+1
-1
@@ -13,7 +13,7 @@ import (
|
||||
"text/template"
|
||||
"time"
|
||||
|
||||
"bitbucket.org/kardianos/osext"
|
||||
"github.com/kardianos/osext"
|
||||
)
|
||||
|
||||
const maxPathSize = 32 * 1024
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ import (
|
||||
"text/template"
|
||||
"time"
|
||||
|
||||
"bitbucket.org/kardianos/osext"
|
||||
"github.com/kardianos/osext"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"bitbucket.org/kardianos/osext"
|
||||
"github.com/kardianos/osext"
|
||||
"code.google.com/p/winsvc/eventlog"
|
||||
"code.google.com/p/winsvc/mgr"
|
||||
"code.google.com/p/winsvc/svc"
|
||||
|
||||
Reference in New Issue
Block a user