Merge remote-tracking branch 'origin/master' into ns-less-memory-for-tokens

This commit is contained in:
Nathan Sobo
2015-05-16 03:05:11 +02:00
14 changed files with 850 additions and 748 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "0.199.0",
"version": "0.200.0",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {
@@ -65,7 +65,7 @@
"space-pen": "3.8.2",
"stacktrace-parser": "0.1.1",
"temp": "0.8.1",
"text-buffer": "^5.2",
"text-buffer": "6.0.0",
"theorist": "^1.0.2",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.6"
@@ -108,7 +108,7 @@
"incompatible-packages": "0.24.0",
"keybinding-resolver": "0.32.0",
"link": "0.30.0",
"markdown-preview": "0.148.0",
"markdown-preview": "0.149.0",
"metrics": "0.48.0",
"notifications": "0.46.0",
"open-on-github": "0.36.0",
@@ -119,7 +119,7 @@
"spell-check": "0.58.0",
"status-bar": "0.72.0",
"styleguide": "0.44.0",
"symbols-view": "0.96.0",
"symbols-view": "0.97.0",
"tabs": "0.68.0",
"timecop": "0.31.0",
"tree-view": "0.171.0",
@@ -132,7 +132,7 @@
"language-coffee-script": "0.40.0",
"language-csharp": "0.5.0",
"language-css": "0.29.0",
"language-gfm": "0.74.0",
"language-gfm": "0.75.0",
"language-git": "0.10.0",
"language-go": "0.26.0",
"language-html": "0.37.0",
@@ -145,7 +145,7 @@
"language-mustache": "0.11.0",
"language-objective-c": "0.15.0",
"language-perl": "0.24.0",
"language-php": "0.22.0",
"language-php": "0.23.0",
"language-property-list": "0.8.0",
"language-python": "0.34.0",
"language-ruby": "0.52.0",
@@ -155,7 +155,7 @@
"language-source": "0.9.0",
"language-sql": "0.15.0",
"language-text": "0.6.0",
"language-todo": "0.20.0",
"language-todo": "0.21.0",
"language-toml": "0.16.0",
"language-xml": "0.28.0",
"language-yaml": "0.22.0"