Merge remote-tracking branch 'origin/master' into cj-keymap-cleanup

This commit is contained in:
probablycorey
2013-11-14 14:43:37 -08:00
19 changed files with 90 additions and 61 deletions

View File

@@ -9,7 +9,7 @@
"bugs": {
"url": "https://github.com/atom/atom/issues"
},
"atomShellVersion": "0.6.9",
"atomShellVersion": "0.6.10",
"dependencies": {
"async": "0.2.6",
"bootstrap": "git://github.com/twbs/bootstrap.git#v3.0.0",
@@ -18,26 +18,26 @@
"coffeestack": "0.6.0",
"emissary": "0.9.0",
"first-mate": "0.5.0",
"fs-plus": "0.7.0",
"fs-plus": "0.9.0",
"fuzzaldrin": "0.1.0",
"git-utils": "0.29.0",
"guid": "0.0.10",
"jasmine-focused": "~0.15.0",
"mkdirp": "0.3.5",
"less-cache": "0.9.0",
"less-cache": "0.10.0",
"nslog": "0.1.0",
"oniguruma": "0.24.0",
"optimist": "0.4.0",
"pathwatcher": "0.9.0",
"pegjs": "0.7.0",
"q": "0.9.7",
"scandal": "0.7.0",
"scandal": "0.8.0",
"season": "0.14.0",
"semver": "1.1.4",
"space-pen": "2.0.0",
"telepath": "0.23.0",
"temp": "0.5.0",
"underscore-plus": "0.2.0"
"underscore-plus": "0.3.0"
},
"devDependencies": {
"biscotto": "0.0.17",
@@ -61,29 +61,29 @@
"jasmine-tagged": "0.2.0",
"request": "~2.27.0",
"unzip": "~0.1.9",
"rcedit": "~0.1.1"
"rcedit": "~0.1.2",
"rimraf": "~2.2.2"
},
"packageDependencies" : {
"packageDependencies": {
"atom-light-ui": "0.6.0",
"atom-light-syntax": "0.6.0",
"atom-dark-ui": "0.6.0",
"atom-dark-syntax": "0.6.0",
"base16-tomorrow-dark-theme": "0.6.0",
"solarized-dark-syntax": "0.4.0",
"archive-view": "0.11.0",
"autocomplete": "0.12.0",
"autoflow": "0.5.0",
"autosave": "0.6.0",
"bookmarks": "0.10.0",
"bracket-matcher": "0.9.0",
"bracket-matcher": "0.11.0",
"command-logger": "0.6.0",
"command-palette": "0.7.0",
"dev-live-reload": "0.14.0",
"dev-live-reload": "0.15.0",
"editor-stats": "0.5.0",
"exception-reporting": "0.5.0",
"find-and-replace": "0.39.0",
"fuzzy-finder": "0.19.0",
"exception-reporting": "0.7.0",
"find-and-replace": "0.40.0",
"fuzzy-finder": "0.20.0",
"gists": "0.6.0",
"git-diff": "0.13.0",
"github-sign-in": "0.9.0",
@@ -92,24 +92,23 @@
"image-view": "0.7.0",
"link": "0.7.0",
"markdown-preview": "0.15.0",
"metrics": "0.8.0",
"package-generator": "0.17.0",
"metrics": "0.11.0",
"package-generator": "0.19.0",
"release-notes": "0.11.0",
"settings-view": "0.37.0",
"settings-view": "0.39.0",
"snippets": "0.13.0",
"spell-check": "0.11.0",
"status-bar": "0.15.1",
"spell-check": "0.13.0",
"status-bar": "0.16.0",
"styleguide": "0.9.0",
"symbols-view": "0.18.0",
"symbols-view": "0.19.0",
"tabs": "0.8.0",
"terminal": "0.15.0",
"terminal": "0.16.0",
"timecop": "0.9.0",
"to-the-hubs": "0.8.0",
"tree-view": "0.28.0",
"to-the-hubs": "0.9.0",
"tree-view": "0.30.0",
"visual-bell": "0.3.0",
"whitespace": "0.8.0",
"wrap-guide": "0.5.0",
"language-c": "0.2.0",
"language-clojure": "0.1.0",
"language-coffee-script": "0.3.0",