var builder = require('./builder')
exports.Builder = builder.Builder
exports.loadBrocfile = builder.loadBrocfile
exports.server = require('./server')
exports.getMiddleware = require('./middleware')
exports.Watcher = require('./watcher')
var cli = require('./cli')
exports.cli = cli

exports.makeTree = function makeTree (dir) {
  throw new Error('broccoli.makeTree has been removed in favor of string literals.\nUse "' + dir + '" instead of broccoli.makeTree("' + dir + '").')
}
exports.bowerTrees = function bowerTrees (dir) {
  throw new Error('broccoli.bowerTrees has been extracted into the broccoli-bower plugin.\nUse `var findBowerTrees = require(\'broccoli-bower\'); findBowerTrees() // => array of trees` instead.')
}
exports.MergedTree = function MergedTree () {
  throw new Error('broccoli.MergedTree has been extracted into the broccoli-merge-trees plugin.\n' +
    'Run "npm install --save-dev broccoli-merge-trees" and use it like so in Brocfile.js:\n' +
    'var mergeTrees = require(\'broccoli-merge-trees\');\n' +
    'var myMergedTree = mergeTrees([tree1, tree2, tree3], { overwrite: true });')
}

@@ -234,881 +234,35 @@
 r')%0A
-var cli = require('./cli')%0Aexports.cli = cli%0A%0Aexports.makeTree = function makeTree (dir) %7B%0A  throw new Error('broccoli.makeTree has been removed in favor of string literals.%5CnUse %22' + dir + '%22 instead of broccoli.makeTree(%22' + dir + '%22).')%0A%7D%0Aexports.bowerTrees = function bowerTrees (dir) %7B%0A  throw new Error('broccoli.bowerTrees has been extracted into the broccoli-bower plugin.%5CnUse %60var findBowerTrees = require(%5C'broccoli-bower%5C'); findBowerTrees() // =%3E array of trees%60 instead.')%0A%7D%0Aexports.MergedTree = function MergedTree () %7B%0A  throw new Error('broccoli.MergedTree has been extracted into the broccoli-merge-trees plugin.%5Cn' +%0A    'Run %22npm install --save-dev broccoli-merge-trees%22 and use it like so in Brocfile.js:%5Cn' +%0A    'var mergeTrees = require(%5C'broccoli-merge-trees%5C');%5Cn' +%0A    'var myMergedTree = mergeTrees(%5Btree1, tree2, tree3%5D, %7B overwrite: true %7D);')%0A%7D
+exports.cli = require('./cli')
 %0A

Remove old removal messages