diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
| commit | c430d88bd40d178685ac0a2e648d8c4ea675996c (patch) | |
| tree | f69f497428fa34c6389173d39c889563dea9506c /windows/ZeroTierOne/ZeroTierOneService.h | |
| parent | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (diff) | |
| parent | d9006712f6ffc975d97097caf2d2b4264405b32c (diff) | |
| download | infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.tar.gz infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to 'windows/ZeroTierOne/ZeroTierOneService.h')
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOneService.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/windows/ZeroTierOne/ZeroTierOneService.h b/windows/ZeroTierOne/ZeroTierOneService.h index 1b97fd46..d4d1a7c6 100644 --- a/windows/ZeroTierOne/ZeroTierOneService.h +++ b/windows/ZeroTierOne/ZeroTierOneService.h @@ -68,9 +68,6 @@ public: void threadMain() throw(); - // Returns false on failure. - static bool doStartUpgrade(const std::string &msiPath); - protected: virtual void OnStart(DWORD dwArgc, PSTR *pszArgv); virtual void OnStop(); |