github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-14 08:35:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-switch-to-display-layers

Browse Source 
# Conflicts:
#	src/text-editor.coffee
This commit is contained in:
Antonio Scandurra
2016-04-26 10:19:39 +02:00
parent e3773f24fc 891071196f
commit 00ebe6bbbc
14 changed files with 93 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -37,9 +37,9 @@
"less-cache": "0.23",
"line-top-index": "0.2.0",
"marked": "^0.3.4",
"nodegit": "0.12.2",
"normalize-package-data": "^2.0.0",
"nslog": "^3",
"ohnogit": "0.0.9",
"oniguruma": "^5",
"pathwatcher": "~6.2",
"property-accessors": "^1.1.3",
@@ -107,17 +107,17 @@
"settings-view": "0.235.1",
"snippets": "1.0.2",
"spell-check": "0.67.1",
"status-bar": "1.2.3",
"status-bar": "1.2.4",
"styleguide": "0.45.2",
"symbols-view": "0.112.0",
"tabs": "0.92.2",
"tabs": "0.93.1",
"timecop": "0.33.1",
"tree-view": "0.206.0",
"tree-view": "0.206.2",
"update-package-dependencies": "0.10.0",
"welcome": "0.34.0",
"whitespace": "0.32.2",
"wrap-guide": "0.38.1",
"language-c": "0.51.3",
"language-c": "0.51.4",
"language-clojure": "0.20.0",
"language-coffee-script": "0.47.0",
"language-csharp": "0.12.1",