Merge branch 'master' into Dependencies

Merge with upstream
This commit is contained in:
Patric Fors
2015-02-28 12:58:11 +01:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"text/template" "text/template"
"time" "time"
"bitbucket.org/kardianos/osext" "github.com/kardianos/osext"
) )
const maxPathSize = 32 * 1024 const maxPathSize = 32 * 1024
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"text/template" "text/template"
"time" "time"
"bitbucket.org/kardianos/osext" "github.com/kardianos/osext"
) )
const ( const (
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"sync" "sync"
"time" "time"
"bitbucket.org/kardianos/osext" "github.com/kardianos/osext"
"code.google.com/p/winsvc/eventlog" "code.google.com/p/winsvc/eventlog"
"code.google.com/p/winsvc/mgr" "code.google.com/p/winsvc/mgr"
"code.google.com/p/winsvc/svc" "code.google.com/p/winsvc/svc"