Anders Hejlsberg 91e8b821ad Merge branch 'master' into exportDefault
Conflicts:
	src/compiler/checker.ts
	tests/baselines/reference/contextualTyping.js.map
	tests/baselines/reference/contextualTyping.sourcemap.txt
	tests/baselines/reference/out-flag.js.map
	tests/baselines/reference/properties.js.map
	tests/baselines/reference/recursiveClassReferenceTest.js.map
	tests/baselines/reference/sourceMap-FileWithComments.js.map
	tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
	tests/baselines/reference/typeResolution.js.map
2015-03-04 06:39:10 -08:00
..