Merge remote-tracking branch 'origin/master' into tyriar/node-pty

This commit is contained in:
Daniel Imms
2017-01-06 23:59:22 -08:00
238 changed files with 4785 additions and 3384 deletions
+3 -3
View File
@@ -39,8 +39,8 @@ const nodeModules = ['electron', 'original-fs']
// Build
const builtInExtensions = [
{ name: 'ms-vscode.node-debug', version: '1.9.0' },
{ name: 'ms-vscode.node-debug2', version: '1.9.0' }
{ name: 'ms-vscode.node-debug', version: '1.9.1' },
{ name: 'ms-vscode.node-debug2', version: '1.9.1' }
];
const vscodeEntryPoints = _.flatten([
@@ -110,7 +110,7 @@ const config = {
version: packageJson.electronVersion,
productAppName: product.nameLong,
companyName: 'Microsoft Corporation',
copyright: 'Copyright (C) 2016 Microsoft. All rights reserved',
copyright: 'Copyright (C) 2017 Microsoft. All rights reserved',
darwinIcon: 'resources/darwin/code.icns',
darwinBundleIdentifier: product.darwinBundleIdentifier,
darwinApplicationCategoryType: 'public.app-category.developer-tools',