maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
TypeScript/src
History
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
harness Add tests for jsdoccomments. 2015-05-28 11:49:11 -07:00
lib Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators 2015-05-29 17:14:29 -07:00
server Revert "Format on type deletes valid text" 2015-05-08 11:37:49 +02:00
services Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators 2015-05-29 17:14:29 -07:00