Merge branch 'master' into chrome35

This commit is contained in:
Kevin Sawicki
2014-07-22 17:56:24 -07:00
13 changed files with 46 additions and 25 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "0.116.0",
"version": "0.118.0",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {
@@ -66,7 +66,8 @@
"atom-dark-ui": "0.32.0",
"atom-light-syntax": "0.20.0",
"atom-light-ui": "0.28.0",
"base16-tomorrow-dark-theme": "0.19.0",
"base16-tomorrow-dark-theme": "0.20.0",
"base16-tomorrow-light-theme": "0.3.0",
"solarized-dark-syntax": "0.21.0",
"solarized-light-syntax": "0.11.0",
"archive-view": "1.0.0",
@@ -113,7 +114,7 @@
"language-css": "0.17.0",
"language-gfm": "0.43.0",
"language-git": "0.9.0",
"language-go": "0.13.0",
"language-go": "0.14.0",
"language-html": "0.22.0",
"language-hyperlink": "0.10.0",
"language-java": "0.11.0",