Merge branch 'master' into proxy-auth

This commit is contained in:
Joao Moreno
2017-07-03 12:37:00 +02:00
7811 changed files with 168219 additions and 201911 deletions

View File

@@ -7,7 +7,7 @@
import { localize } from 'vs/nls';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IWindowsMainService } from 'vs/code/electron-main/windows';
import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
import { fromEventEmitter } from 'vs/base/node/event';
import { BrowserWindow, app } from 'electron';