Merge branch 'master' into dh-async-repo

This commit is contained in:
joshaber
2015-11-17 11:39:22 -08:00
36 changed files with 609 additions and 176 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "1.3.0-dev",
"version": "1.4.0-dev",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {
@@ -15,7 +15,7 @@
"electronVersion": "0.34.3",
"dependencies": {
"async": "0.2.6",
"atom-keymap": "^6.1.0",
"atom-keymap": "^6.1.1",
"babel-core": "^5.8.21",
"bootstrap": "^3.3.4",
"cached-run-in-this-context": "0.4.0",
@@ -53,7 +53,7 @@
"service-hub": "^0.7.0",
"source-map-support": "^0.3.2",
"temp": "0.8.1",
"text-buffer": "^8.0.3",
"text-buffer": "^8.0.4",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.6",
"yargs": "^3.23.0"
@@ -98,7 +98,7 @@
"keybinding-resolver": "0.33.0",
"line-ending-selector": "0.3.0",
"link": "0.31.0",
"markdown-preview": "0.156.1",
"markdown-preview": "0.156.2",
"metrics": "0.53.0",
"notifications": "0.61.0",
"open-on-github": "0.40.0",
@@ -109,12 +109,12 @@
"spell-check": "0.63.0",
"status-bar": "0.80.0",
"styleguide": "0.45.0",
"symbols-view": "0.110.0",
"symbols-view": "0.110.1",
"tabs": "0.88.0",
"timecop": "0.33.0",
"tree-view": "0.198.0",
"update-package-dependencies": "0.10.0",
"welcome": "0.32.0",
"welcome": "0.33.0",
"whitespace": "0.32.0",
"wrap-guide": "0.38.1",
"language-c": "0.49.0",
@@ -134,11 +134,11 @@
"language-make": "0.20.0",
"language-mustache": "0.13.0",
"language-objective-c": "0.15.0",
"language-perl": "0.30.0",
"language-perl": "0.31.0",
"language-php": "0.34.0",
"language-property-list": "0.8.0",
"language-python": "0.41.0",
"language-ruby": "0.61.0",
"language-ruby": "0.62.0",
"language-ruby-on-rails": "0.24.0",
"language-sass": "0.43.0",
"language-shellscript": "0.20.0",