David Glasser 21bdac8734 Merge branch 'master' into devel ...

Conflicts:
	History.md
	packages/accounts-password/package.js
	packages/accounts-password/password_server.js
	packages/constraint-solver/package.js
	packages/meteor-tool/package.js
	packages/non-core/npm-bcrypt/package.js
	packages/package-version-parser/package-version-parser-tests.js
	packages/package-version-parser/package-version-parser.js
	packages/package-version-parser/package.js
	tools/selftest.js

2015-03-17 13:41:14 -07:00

..

admin

Merge branch 'master' into devel

2015-03-17 13:41:14 -07:00

windows

Fix typo

2015-03-12 22:37:54 -07: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

Upgrade Mongo to 2.6.7 and OpenSSL to 1.0.2

2015-02-05 22:40:43 -08:00

build-node-for-dev-bundle.sh

Update other places that mention the Node version

2015-02-05 22:40:43 -08:00

dev-bundle-server-package.js

Switch to using a fork of fibers on Windows

2015-02-09 12:10:44 -08:00

dev-bundle-tool-package.js

Update pathwatcher, which took our PR

2015-02-16 14:34:54 -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.ps1

Remove too-long path

2015-03-12 19:15:12 -07:00

generate-dev-bundle.sh

Remove the outdated line deleting a benchmarks folder in browserify from the

2015-02-16 15:13:41 -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