Mt erge branch 'master' into api-docs

This commit is contained in:
Matt Colyer
2013-10-22 15:12:43 -07:00
4 changed files with 12 additions and 22 deletions

View File

@@ -1,9 +1,6 @@
{Document, Point, Range, Site} = require 'telepath'
_ = require 'underscore-plus'
#TODO Remove once all packages have been updated
_.nextTick = setImmediate
module.exports =
_: _
BufferedNodeProcess: require '../src/buffered-node-process'

View File

@@ -71,7 +71,7 @@
"solarized-dark-syntax": "0.3.0",
"archive-view": "0.11.0",
"autocomplete": "0.10.0",
"autocomplete": "0.11.0",
"autoflow": "0.5.0",
"bookmarks": "0.8.0",
"bracket-matcher": "0.7.0",
@@ -84,29 +84,29 @@
"find-and-replace": "0.29.0",
"fuzzy-finder": "0.15.0",
"gfm": "0.5.0",
"git-diff": "0.11.0",
"git-diff": "0.12.0",
"gists": "0.5.0",
"github-sign-in": "0.8.0",
"go-to-line": "0.8.0",
"grammar-selector": "0.7.0",
"grammar-selector": "0.8.0",
"image-view": "0.7.0",
"link": "0.6.0",
"markdown-preview": "0.9.0",
"link": "0.7.0",
"markdown-preview": "0.11.0",
"metrics": "0.8.0",
"package-generator": "0.13.0",
"release-notes": "0.8.0",
"settings-view": "0.29.0",
"snippets": "0.10.0",
"spell-check": "0.7.0",
"status-bar": "0.14.0",
"snippets": "0.11.0",
"spell-check": "0.8.0",
"status-bar": "0.15.0",
"styleguide": "0.9.0",
"symbols-view": "0.12.0",
"tabs": "0.7.0",
"terminal": "0.13.0",
"timecop": "0.6.0",
"terminal": "0.14.0",
"timecop": "0.7.0",
"to-the-hubs": "0.8.0",
"toml": "0.3.0",
"tree-view": "0.19.0",
"tree-view": "0.20.0",
"whitespace": "0.7.0",
"wrap-guide": "0.4.0",

View File

@@ -94,13 +94,6 @@ class PackageManager
packagePath = path.join(@resourcePath, 'node_modules', name)
return packagePath if @isInternalPackage(packagePath)
#TODO Remove once all package specs have been updated
if match = /(.+)-tmbundle$/.exec(name)
if name is 'hyperlink-helper-tmbundle'
@resolvePackagePath('language-hyperlink')
else
@resolvePackagePath("language-#{match[1]}")
isInternalPackage: (packagePath) ->
{engines} = Package.loadMetadata(packagePath, true)
engines?.atom?

2
vendor/apm vendored

Submodule vendor/apm updated: 3d64c688c5...08f26c2edb