Merge branch 'release-0.9.4' of github.com:meteor/meteor into release-0.9.4

This commit is contained in:
Sashko Stubailo
2014-09-29 21:35:10 -07:00
2 changed files with 4 additions and 3 deletions

View File

@@ -2268,8 +2268,8 @@ exports.readJsImage = function (controlFilePath) {
// Given an array of isopack names, invokes the callback with each
// corresponding Isopack object, plus all of their transitive dependencies,
// with a topological sort.
exports.iterateOverAllUsedIsopacks = function (loader, arch,
packageNames, callback) {
exports.iterateOverAllUsedIsopacks =
function (loader, arch, packageNames, callback) {
buildmessage.assertInCapture();
var target = new Target({packageLoader: loader,
arch: arch});
@@ -2278,3 +2278,4 @@ exports.iterateOverAllUsedIsopacks = function (loader, arch,
callback(unibuild.pkg);
});
};

View File

@@ -599,7 +599,7 @@ _.extend(PackageSource.prototype, {
// - sources: sources for the plugin (array of string)
// - npmDependencies: map from npm package name to required
// version (string)
/**
* @summary Define a build plugin. A build plugin extends the build
* process for apps and packages that use this package. For example,