Jason Freeman 7459c87265 Merge branch 'release-1.4' ...

Conflicts:
	bin/lib.core.es6.d.ts
	bin/lib.es6.d.ts
	bin/tsc.js
	bin/typescript.d.ts
	bin/typescriptServices.d.ts
	bin/typescriptServices.js
	bin/typescriptServices_internal.d.ts
	bin/typescript_internal.d.ts

2015-01-05 15:08:17 -08:00

..

baselines/reference

Merge branch 'release-1.4'

2015-01-05 15:08:17 -08:00

cases

Merge branch 'release-1.4'

2015-01-05 15:08:17 -08:00

webhost

…

perfsys.ts

…

perftsc.ts

…

test.bat

…

webTestResults.html

…

webTestServer.ts

…