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

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

Browse Source 
# Conflicts:
#	src/display-buffer.coffee
#	src/text-editor.coffee
#	src/tokenized-buffer.coffee
This commit is contained in:
Antonio Scandurra
2016-04-27 18:16:03 +02:00
parent 5cfe97160d 3b204d404f
commit ce4b2fa810
13 changed files with 152 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@@ -39,7 +39,7 @@
"marked": "^0.3.4",
"normalize-package-data": "^2.0.0",
"nslog": "^3",
"ohnogit": "0.0.9",
"ohnogit": "0.0.11",
"oniguruma": "^5",
"pathwatcher": "~6.2",
"property-accessors": "^1.1.3",
@@ -107,7 +107,7 @@
"settings-view": "0.235.1",
"snippets": "1.0.2",
"spell-check": "0.67.1",
"status-bar": "1.2.4",
"status-bar": "1.2.6",
"styleguide": "0.45.2",
"symbols-view": "0.112.0",
"tabs": "0.93.1",
@@ -141,7 +141,7 @@
"language-ruby": "0.68.5",
"language-ruby-on-rails": "0.25.0",
"language-sass": "0.47.0",
"language-shellscript": "0.21.1",
"language-shellscript": "0.22.0",
"language-source": "0.9.0",
"language-sql": "0.21.0",
"language-text": "0.7.1",