Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-19 16:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into alex/tokenization

Browse Source
This commit is contained in:
Alex Dima
2017-01-09 11:19:26 +01:00
parent 8ba6bc5505 cf1412bbf6
commit 88c45c4e57
50 changed files with 800 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -30,7 +30,7 @@
"iconv-lite": "0.4.15",
"minimist": "1.2.0",
"native-keymap": "0.3.0",
"pty.js": "https://github.com/Tyriar/pty.js/tarball/c75c2dcb6dcad83b0cb3ef2ae42d0448fb912642",
"node-pty": "0.4.1",
"semver": "4.3.6",
"vscode-debugprotocol": "1.15.0",
"vscode-textmate": "3.1.0",