Merge branch 'master' into refine-paste-normalization

This commit is contained in:
Matt Colyer
2013-11-14 11:23:45 -08:00

View File

@@ -61,22 +61,22 @@
"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.10.0",
"bracket-matcher": "0.11.0",
"command-logger": "0.6.0",
"command-palette": "0.7.0",
"dev-live-reload": "0.15.0",
@@ -92,15 +92,15 @@
"image-view": "0.7.0",
"link": "0.7.0",
"markdown-preview": "0.15.0",
"metrics": "0.10.0",
"metrics": "0.11.0",
"package-generator": "0.19.0",
"release-notes": "0.11.0",
"settings-view": "0.38.0",
"settings-view": "0.39.0",
"snippets": "0.13.0",
"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.16.0",
"timecop": "0.9.0",
@@ -109,7 +109,6 @@
"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",