github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into cj-ns-pane-models

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Nathan Sobo
2014-01-13 12:55:02 -07:00
parent 4179d9d268 c2381ba61c
commit fe0cdbf349
5 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package.json
View File

@@ -24,10 +24,10 @@
"coffee-script": "1.6.3",
"coffeestack": "0.6.0",
"emissary": "0.31.0",
"first-mate": "0.14.0",
"first-mate": "0.17.0",
"fs-plus": "0.14.0",
"fstream": "0.1.24",
"fuzzaldrin": "0.5.0",
"fuzzaldrin": "0.6.0",
"git-utils": "0.29.0",
"guid": "0.0.10",
"jasmine-focused": "~0.15.0",
@@ -41,7 +41,7 @@
"oniguruma": "0.24.0",
"optimist": "0.4.0",
"pathwatcher": "0.11.0",
"pegjs": "0.7.0",
"pegjs": "0.8.0",
"q": "0.9.7",
"scandal": "0.11.0",
"season": "0.14.0",
@@ -52,7 +52,8 @@
"underscore-plus": "0.6.1",
"theorist": "~0.13.0",
"delegato": "~0.4.0",
"mixto": "~0.4.0"
"mixto": "~0.4.0",
"underscore-plus": "0.6.1"
},
"packageDependencies": {
"atom-dark-syntax": "0.10.0",
@@ -66,14 +67,14 @@
"autocomplete": "0.19.0",
"autoflow": "0.11.0",
"autosave": "0.10.0",
"background-tips": "0.3.0",
"background-tips": "0.4.0",
"bookmarks": "0.15.0",
"bracket-matcher": "0.16.0",
"command-logger": "0.8.0",
"command-palette": "0.14.0",
"dev-live-reload": "0.22.0",
"editor-stats": "0.12.0",
"exception-reporting": "0.10.0",
"exception-reporting": "0.11.0",
"feedback": "0.22.0",
"find-and-replace": "0.74.0",
"fuzzy-finder": "0.30.0",
@@ -85,20 +86,21 @@
"image-view": "0.15.0",
"keybinding-resolver": "0.8.0",
"markdown-preview": "0.24.0",
"metrics": "0.20.0",
"markdown-preview": "0.23.0",
"metrics": "0.21.0",
"package-generator": "0.23.0",
"release-notes": "0.15.0",
"settings-view": "0.55.0",
"snippets": "0.17.0",
"snippets": "0.18.0",
"spell-check": "0.18.0",
"status-bar": "0.30.0",
"status-bar": "0.31.0",
"styleguide": "0.19.0",
"symbols-view": "0.27.0",
"tabs": "0.17.0",
"terminal": "0.23.0",
"timecop": "0.12.0",
"timecop": "0.13.0",
"to-the-hubs": "0.17.0",
"tree-view": "0.58.0",
"tree-view": "0.59.0",
"visual-bell": "0.6.0",
"welcome": "0.4.0",
"whitespace": "0.10.0",