Jason Freeman 059bb18bac Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators ...

Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.symbols
	tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.symbols
	tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.symbols
	tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.symbols
	tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols
	tests/baselines/reference/for-of37.symbols
	tests/baselines/reference/for-of38.symbols
	tests/baselines/reference/for-of40.symbols
	tests/baselines/reference/for-of45.symbols
	tests/baselines/reference/for-of50.symbols
	tests/baselines/reference/iterableArrayPattern30.symbols
	tests/baselines/reference/promiseVoidErrorCallback.symbols
	tests/baselines/reference/typedArrays.symbols

2015-05-29 17:14:29 -07:00

..

compiler

Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators

2015-05-29 17:14:29 -07:00

conformance

Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators

2015-05-27 13:24:00 -04:00

fourslash

Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators

2015-05-29 17:14:29 -07:00

fourslash_old

…

project

Add rootDir tests

2015-04-14 22:19:59 -07:00

projects

Add rootDir tests

2015-04-14 22:19:59 -07:00

test262-harness

…

unittests

Parsing support for jsDocComments.

2015-05-28 10:14:18 -07:00