github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-17 01:51:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chrome35

Browse Source 
Conflicts:
	apm/package.json
	package.json
This commit is contained in:
Cheng Zhao
2014-07-24 17:12:32 +08:00
parent 39868a2330 5d00ca8bb6
commit dcbf730129
39 changed files with 159 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -96,12 +96,12 @@
"package-generator": "0.31.0",
"release-notes": "0.35.0",
"settings-view": "0.134.0",
"snippets": "1.0.0",
"snippets": "1.1.0",
"spell-check": "1.0.0",
"status-bar": "0.41.0",
"styleguide": "0.29.0",
"symbols-view": "1.0.0",
"tabs": "0.45.0",
"tabs": "0.46.0",
"timecop": "0.21.0",
"tree-view": "1.1.0",
"update-package-dependencies": "0.6.0",
@@ -109,16 +109,16 @@
"whitespace": "0.25.0",
"wrap-guide": "0.21.0",
"language-c": "0.22.0",
"language-c": "0.24.0",
"language-coffee-script": "0.27.0",
"language-css": "0.17.0",
"language-gfm": "0.43.0",
"language-git": "0.9.0",
"language-go": "0.14.0",
"language-go": "0.15.0",
"language-html": "0.22.0",
"language-hyperlink": "0.10.0",
"language-java": "0.11.0",
"language-javascript": "0.36.0",
"language-javascript": "0.37.0",
"language-json": "0.8.0",
"language-less": "0.13.0",
"language-make": "0.10.0",