Emily Stark 71652f9b9f Merge branch 'master' into devel ...

Conflicts:
	History.md
	docs/client/data.js
	docs/client/full-api/concepts.html
	docs/client/full-api/tableOfContents.js
	examples/localmarket/.meteor/packages
	packages/ddp/package.js
	packages/meteor-tool/package.js
	packages/mongo/package.js
	scripts/admin/manifest.json

2014-12-09 13:15:29 -08:00

..

admin

Merge branch 'master' into devel

2014-12-09 13:15:29 -08:00

build-dev-bundle-common.sh

Decompose common dev_bundle build logic and variables.

2014-11-25 20:56:59 -05:00

build-mongo-for-dev-bundle.sh

Add script for building mongo separately.

2014-11-25 22:08:14 -05:00

build-node-for-dev-bundle.sh

Add script for building node separately.

2014-11-25 22:08:14 -05:00

dev-bundle-server-package.js

move tool deps to package.json to run npm dedupe

2014-11-26 10:19:37 -08:00

dev-bundle-tool-package.js

Automatically line-wrap output

2014-12-04 17:56:04 -08:00

doctool.js

Document Blaze.Var, check in doctool.js

2014-04-29 11:05:03 -07:00

doctool.md

Document Blaze.Var, check in doctool.js

2014-04-29 11:05:03 -07:00

doctool.md.md

Document Blaze.Var, check in doctool.js

2014-04-29 11:05:03 -07:00

generate-android-bundle.sh

Prompt user with licensing file before meteor add-platform

2014-09-11 14:52:11 -07:00

generate-dev-bundle.sh

Automatically line-wrap output

2014-12-04 17:56:04 -08:00

node.sh

use meteor --get-ready instead of --version in places where we're trying to make

2013-03-29 11:52:33 -07:00