Anders Hejlsberg e4b7cf9882 Merge branch 'master' into reducedUnionTypes ...

Conflicts:
	src/compiler/types.ts
	tests/baselines/reference/APISample_compile.js
	tests/baselines/reference/APISample_compile.types
	tests/baselines/reference/APISample_linter.js
	tests/baselines/reference/APISample_linter.types
	tests/baselines/reference/APISample_transform.js
	tests/baselines/reference/APISample_transform.types
	tests/baselines/reference/APISample_watcher.js
	tests/baselines/reference/APISample_watcher.types

2015-04-12 11:08:03 -07:00

..

baselines/reference

Merge branch 'master' into reducedUnionTypes

2015-04-12 11:08:03 -07:00

cases

Merge branch 'master' into reducedUnionTypes

2015-04-12 11:08:03 -07:00

webhost

…

perfsys.ts

…

perftsc.ts

…

test.bat

…

webTestResults.html

…

webTestServer.ts

…