Emily Stark ccfee68145 Merge branch 'master' into devel ...

Conflicts:
	docs/client/api.html
	docs/client/data.js
	docs/client/names.json
	meteor
	packages/autoupdate/package.js
	packages/base64/.gitignore
	packages/constraint-solver/package.js
	packages/device-orientation/.gitignore
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/package-version-parser/package.js
	packages/webapp/webapp_server.js
	scripts/admin/meteor-release-experimental.json
	tools/commands.js
	tools/help.txt
	tools/package-version-parser.js
	tools/run-all.js
	tools/tests/apps/build-errors/packages/with-colon-plugin/.gitignore

2014-09-15 14:48:57 -07:00

..

jsdoc

Add comment explaining change

2014-09-10 15:47:50 -07:00

publish-release/packages

Refactor bash scripts to a single import + a bunch of executables.

2014-08-27 23:17:33 -07:00

banners-oldcore.json

banner tweaks

2014-08-26 07:50:53 -07:00

banners.json

Add 0.9.2 banner

2014-09-15 11:25:22 -07:00

copy-dev-bundle-from-jenkins.sh

copy-dev-bundle-from-jenkins: don't overwrite!

2014-06-25 14:56:37 -07:00

find-new-npm-versions.sh

"tools" -> "scripts", "engine" -> "tools"

2013-03-19 18:19:31 -07:00

install-from-bootstrap.sh

use .meteor instead of .meteor0!

2014-08-05 20:10:00 -07:00

launch-meteor

update launch-meteor for packaging

2014-08-06 15:29:45 -07:00

manifest.json

Update manifest

2014-09-15 12:34:19 -07:00

meteor-release-experimental.json

Bump

2014-09-11 17:56:53 -07:00

meteor-release-official.json

Bump package versions for 0.9.2

2014-09-15 11:36:57 -07:00

old-banner.txt

banner text from geoff

2014-08-25 19:11:35 -07:00