Merge branch 'master' into exception-reporting

Conflicts:
	package.json
This commit is contained in:
Matt Colyer
2013-09-24 09:48:12 -07:00
10 changed files with 85 additions and 13 deletions

View File

@@ -35,13 +35,13 @@
"semver": "1.1.4",
"space-pen": "1.2.0",
"tantamount": "0.3.0",
"telepath": "0.1.2",
"telepath": "0.4.0",
"temp": "0.5.0",
"underscore": "1.4.4",
"atom-light-ui": "0.1.1",
"atom-light-ui": "0.2.0",
"atom-light-syntax": "0.2.0",
"atom-dark-ui": "0.1.1",
"atom-dark-ui": "0.2.0",
"atom-dark-syntax": "0.2.0",
"base16-tomorrow-dark-theme": "0.1.0",
"solarized-dark-syntax": "0.1.0",
@@ -56,30 +56,31 @@
"command-palette": "0.3.0",
"editor-stats": "0.2.0",
"exception-reporting": "0.1.0",
"find-and-replace": "0.5.0",
"find-and-replace": "0.9.0",
"fuzzy-finder": "0.5.0",
"gfm": "0.4.0",
"git-diff": "0.3.0",
"gists": "0.2.0",
"github-sign-in": "0.2.0",
"github-sign-in": "0.4.0",
"go-to-line": "0.3.0",
"grammar-selector": "0.4.0",
"image-view": "0.5.0",
"link": "0.2.0",
"markdown-preview": "0.3.0",
"metrics": "0.1.1",
"package-generator": "0.7.0",
"package-generator": "0.8.0",
"settings-view": "0.22.0",
"snippets": "0.4.0",
"snippets": "0.5.0",
"spell-check": "0.5.0",
"status-bar": "0.7.0",
"symbols-view": "0.5.0",
"tabs": "0.4.0",
"terminal": "0.9.0",
"timecop": "0.2.0",
"to-the-hubs": "0.3.0",
"toml": "0.2.0",
"tree-view": "0.5.0",
"ui-demo": "0.6.0",
"tree-view": "0.6.0",
"ui-demo": "0.7.0",
"whitespace": "0.4.0",
"wrap-guide": "0.2.0",