Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 06:51:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into font-family-jp

Browse Source
This commit is contained in:
Pine
2019-09-16 15:18:26 -07:00
committed by GitHub
parent 0c4d56eebb 7eb355846f
commit b3b0ee5d31
1286 changed files with 49168 additions and 30612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
View File

@@ -7,7 +7,7 @@ import 'vs/css!./media/processExplorer';
import { webFrame, ipcRenderer, clipboard } from 'electron';
import { repeat } from 'vs/base/common/strings';
import { totalmem } from 'os';
import product from 'vs/platform/product/node/product';
import product from 'vs/platform/product/common/product';
import { localize } from 'vs/nls';
import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/node/issue';
import * as browser from 'vs/base/browser/browser';