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

Merge branch 'master' into chrome35

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Kevin Sawicki
2014-07-28 09:02:38 -07:00
parent 393552a4b6 e70c696fef
commit 7e415ffdb7
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -67,7 +67,7 @@
"atom-light-syntax": "0.20.0",
"atom-light-ui": "0.28.0",
"base16-tomorrow-dark-theme": "0.20.0",
"base16-tomorrow-light-theme": "0.3.0",
"base16-tomorrow-light-theme": "0.4.0",
"solarized-dark-syntax": "0.21.0",
"solarized-light-syntax": "0.11.0",
"archive-view": "1.0.0",
@@ -96,13 +96,13 @@
"open-on-github": "0.29.0",
"package-generator": "0.31.0",
"release-notes": "0.36.0",
"settings-view": "0.135.0",
"settings-view": "0.136.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.47.0",
"tabs": "0.48.0",
"timecop": "0.22.0",
"tree-view": "1.1.0",
"update-package-dependencies": "0.6.0",
@@ -115,7 +115,7 @@
"language-css": "0.17.0",
"language-gfm": "0.43.0",
"language-git": "0.9.0",
"language-go": "0.15.0",
"language-go": "0.16.0",
"language-html": "0.22.0",
"language-hyperlink": "0.10.0",
"language-java": "0.11.0",
@@ -137,7 +137,7 @@
"language-text": "0.6.0",
"language-todo": "0.10.0",
"language-toml": "0.12.0",
"language-xml": "0.15.0",
"language-xml": "0.17.0",
"language-yaml": "0.13.0"
},
"private": true,