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

Merge remote-tracking branch 'origin/master' into tyriar/electron-1.7.5

Browse Source
This commit is contained in:
Daniel Imms
2017-08-20 16:35:38 -07:00
parent 49001c508d 7e539de2f4
commit 04f22441c6
208 changed files with 4066 additions and 2287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -2
View File
@@ -35,7 +35,7 @@
"keytar": "^4.0.3",
"minimist": "1.2.0",
"native-keymap": "1.2.4",
"native-watchdog": "0.1.0",
"native-watchdog": "0.2.0",
"node-pty": "0.6.9",
"nsfw": "1.0.16",
"semver": "4.3.6",
@@ -44,7 +44,7 @@
"vscode-ripgrep": "0.0.25",
"vscode-textmate": "^3.1.5",
"winreg": "1.2.0",
"xterm": "Tyriar/xterm.js#vscode-release/1.15",
"xterm": "Tyriar/xterm.js#vscode-release/1.16",
"yauzl": "2.8.0"
},
"devDependencies": {