github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-19 02:44:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-use-display-layers

Browse Source 
# Conflicts:
#	package.json
#	src/display-buffer.coffee
#	src/text-editor.coffee
#	src/tokenized-buffer.coffee
This commit is contained in:
Antonio Scandurra
2016-03-10 13:53:14 +01:00
parent 0243a345b7 4b017759c9
commit dfed7c4537
114 changed files with 2475 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
package.json
View File

@@ -12,10 +12,10 @@
"url": "https://github.com/atom/atom/issues"
},
"license": "MIT",
"electronVersion": "0.34.5",
"electronVersion": "0.36.8",
"dependencies": {
"async": "0.2.6",
"atom-keymap": "^6.2.0",
"atom-keymap": "^6.3.1",
"babel-core": "^5.8.21",
"bootstrap": "^3.3.4",
"cached-run-in-this-context": "0.4.1",
@@ -28,7 +28,7 @@
"fs-plus": "^2.8.0",
"fstream": "0.1.24",
"fuzzaldrin": "^2.1",
"git-utils": "^4.1.0",
"git-utils": "^4.1.2",
"grim": "1.5.0",
"jasmine-json": "~0.0",
"jasmine-tagged": "^1.1.4",
@@ -38,7 +38,7 @@
"line-top-index": "0.2.0",
"marked": "^0.3.4",
"marker-index": "^3.0.4",
"nodegit": "0.9.0",
"nodegit": "0.11.9",
"normalize-package-data": "^2.0.0",
"nslog": "^3",
"oniguruma": "^5",
@@ -55,7 +55,7 @@
"service-hub": "^0.7.0",
"source-map-support": "^0.3.2",
"temp": "0.8.1",
"text-buffer": "8.2.1",
"text-buffer": "8.4.1",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.6",
"yargs": "^3.23.0"
@@ -67,70 +67,70 @@
"atom-light-ui": "0.43.0",
"base16-tomorrow-dark-theme": "1.1.0",
"base16-tomorrow-light-theme": "1.1.1",
"one-dark-ui": "1.1.9",
"one-light-ui": "1.1.9",
"one-dark-ui": "1.2.0",
"one-light-ui": "1.2.0",
"one-dark-syntax": "1.2.0",
"one-light-syntax": "1.2.0",
"solarized-dark-syntax": "1.0.0",
"solarized-light-syntax": "1.0.0",
"about": "1.3.0",
"archive-view": "0.61.0",
"about": "1.4.0",
"archive-view": "0.61.1",
"autocomplete-atom-api": "0.10.0",
"autocomplete-css": "0.11.0",
"autocomplete-html": "0.7.2",
"autocomplete-plus": "2.25.0",
"autocomplete-plus": "2.29.1",
"autocomplete-snippets": "1.10.0",
"autoflow": "0.27.0",
"autosave": "0.23.0",
"autosave": "0.23.1",
"background-tips": "0.26.0",
"bookmarks": "0.38.2",
"bracket-matcher": "0.79.0",
"bracket-matcher": "0.81.0",
"command-palette": "0.38.0",
"deprecation-cop": "0.54.0",
"deprecation-cop": "0.54.1",
"dev-live-reload": "0.47.0",
"encoding-selector": "0.21.0",
"exception-reporting": "0.37.0",
"find-and-replace": "0.197.1",
"fuzzy-finder": "0.94.0",
"git-diff": "0.57.0",
"find-and-replace": "0.197.4",
"fuzzy-finder": "1.0.3",
"git-diff": "1.0.0",
"go-to-line": "0.30.0",
"grammar-selector": "0.48.0",
"image-view": "0.56.0",
"incompatible-packages": "0.25.0",
"keybinding-resolver": "0.33.0",
"line-ending-selector": "0.3.0",
"grammar-selector": "0.48.1",
"image-view": "0.57.0",
"incompatible-packages": "0.25.1",
"keybinding-resolver": "0.35.0",
"line-ending-selector": "0.3.1",
"link": "0.31.0",
"markdown-preview": "0.157.2",
"markdown-preview": "0.157.3",
"metrics": "0.53.1",
"notifications": "0.62.1",
"open-on-github": "0.41.0",
"package-generator": "0.41.0",
"settings-view": "0.232.3",
"notifications": "0.62.3",
"open-on-github": "1.0.0",
"package-generator": "0.41.1",
"settings-view": "0.232.4",
"snippets": "1.0.1",
"spell-check": "0.65.0",
"status-bar": "0.83.0",
"styleguide": "0.45.1",
"symbols-view": "0.110.1",
"tabs": "0.90.0",
"timecop": "0.33.0",
"tree-view": "0.201.0",
"spell-check": "0.67.0",
"status-bar": "1.1.0",
"styleguide": "0.45.2",
"symbols-view": "0.112.0",
"tabs": "0.91.3",
"timecop": "0.33.1",
"tree-view": "0.203.0",
"update-package-dependencies": "0.10.0",
"welcome": "0.33.0",
"whitespace": "0.32.1",
"welcome": "0.34.0",
"whitespace": "0.32.2",
"wrap-guide": "0.38.1",
"language-c": "0.51.1",
"language-clojure": "0.19.1",
"language-coffee-script": "0.46.0",
"language-coffee-script": "0.46.1",
"language-csharp": "0.11.0",
"language-css": "0.36.0",
"language-gfm": "0.84.0",
"language-gfm": "0.85.0",
"language-git": "0.12.1",
"language-go": "0.42.0",
"language-html": "0.44.0",
"language-html": "0.44.1",
"language-hyperlink": "0.16.0",
"language-java": "0.17.0",
"language-javascript": "0.110.0",
"language-json": "0.17.4",
"language-json": "0.17.5",
"language-less": "0.29.0",
"language-make": "0.21.0",
"language-mustache": "0.13.0",
@@ -139,16 +139,16 @@
"language-php": "0.37.0",
"language-property-list": "0.8.0",
"language-python": "0.43.0",
"language-ruby": "0.68.0",
"language-ruby": "0.68.1",
"language-ruby-on-rails": "0.25.0",
"language-sass": "0.45.0",
"language-shellscript": "0.21.0",
"language-source": "0.9.0",
"language-sql": "0.20.0",
"language-text": "0.7.0",
"language-text": "0.7.1",
"language-todo": "0.27.0",
"language-toml": "0.18.0",
"language-xml": "0.34.2",
"language-xml": "0.34.4",
"language-yaml": "0.25.1"
},
"private": true,
@@ -174,7 +174,8 @@
"runs",
"spyOn",
"waitsFor",
"waitsForPromise"
"waitsForPromise",
"indexedDB"
]
}
}