github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into as-block-decorations

Browse Source
This commit is contained in:
Antonio Scandurra
2016-01-14 09:30:06 -07:00
parent e6a1763f8c de44221087
commit f81843d465
42 changed files with 391 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "1.5.0-dev",
"version": "1.6.0-dev",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {
@@ -22,17 +22,17 @@
"clear-cut": "^2.0.1",
"coffee-script": "1.8.0",
"color": "^0.7.3",
"event-kit": "^1.3.0",
"event-kit": "^1.5.0",
"find-parent-dir": "^0.3.0",
"first-mate": "^5.1.1",
"fs-plus": "^2.8.0",
"fstream": "0.1.24",
"fuzzaldrin": "^2.1",
"git-utils": "^4.0.7",
"git-utils": "^4.1.0",
"grim": "1.5.0",
"jasmine-json": "~0.0",
"jasmine-tagged": "^1.1.4",
"jquery": "^2.1.1",
"jquery": "2.1.4",
"key-path-helpers": "^0.4.0",
"less-cache": "0.22",
"line-top-index": "0.2.0",
@@ -53,7 +53,7 @@
"service-hub": "^0.7.0",
"source-map-support": "^0.3.2",
"temp": "0.8.1",
"text-buffer": "8.1.3",
"text-buffer": "8.1.4",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.6",
"yargs": "^3.23.0"
@@ -66,12 +66,12 @@
"base16-tomorrow-dark-theme": "1.1.0",
"base16-tomorrow-light-theme": "1.1.1",
"one-dark-ui": "1.1.9",
"one-dark-syntax": "1.1.1",
"one-light-syntax": "1.1.1",
"one-light-ui": "1.1.9",
"one-dark-syntax": "1.1.2",
"one-light-syntax": "1.1.2",
"solarized-dark-syntax": "0.39.0",
"solarized-light-syntax": "0.23.0",
"about": "1.1.0",
"about": "1.3.0",
"archive-view": "0.61.0",
"autocomplete-atom-api": "0.9.2",
"autocomplete-css": "0.11.0",
@@ -103,16 +103,15 @@
"notifications": "0.62.1",
"open-on-github": "0.40.0",
"package-generator": "0.41.0",
"release-notes": "0.53.0",
"settings-view": "0.232.1",
"settings-view": "0.232.3",
"snippets": "1.0.1",
"spell-check": "0.63.0",
"spell-check": "0.65.0",
"status-bar": "0.80.0",
"styleguide": "0.45.0",
"symbols-view": "0.110.1",
"tabs": "0.88.0",
"timecop": "0.33.0",
"tree-view": "0.198.0",
"tree-view": "0.198.1",
"update-package-dependencies": "0.10.0",
"welcome": "0.33.0",
"whitespace": "0.32.1",
@@ -122,24 +121,24 @@
"language-coffee-script": "0.46.0",
"language-csharp": "0.11.0",
"language-css": "0.36.0",
"language-gfm": "0.82.0",
"language-gfm": "0.83.0",
"language-git": "0.11.0",
"language-go": "0.41.0",
"language-html": "0.43.1",
"language-go": "0.42.0",
"language-html": "0.44.0",
"language-hyperlink": "0.16.0",
"language-java": "0.17.0",
"language-javascript": "0.104.0",
"language-json": "0.17.2",
"language-javascript": "0.105.0",
"language-json": "0.17.3",
"language-less": "0.29.0",
"language-make": "0.21.0",
"language-mustache": "0.13.0",
"language-objective-c": "0.15.1",
"language-perl": "0.32.0",
"language-php": "0.34.0",
"language-php": "0.36.0",
"language-property-list": "0.8.0",
"language-python": "0.42.1",
"language-ruby": "0.65.0",
"language-ruby-on-rails": "0.24.0",
"language-python": "0.43.0",
"language-ruby": "0.68.0",
"language-ruby-on-rails": "0.25.0",
"language-sass": "0.45.0",
"language-shellscript": "0.21.0",
"language-source": "0.9.0",