Kanchalai Tanglertsampan beb72f4057 Merge branch 'master' into transforms ...

# Conflicts:
#	Jakefile.js
#	src/compiler/emitter.ts
#	src/compiler/program.ts
#	src/compiler/types.ts
#	src/harness/harness.ts
#	src/services/services.ts
#	tests/baselines/reference/disallowAsyncModifierInES5.js
#	tests/baselines/reference/es5andes6module.js
#	tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
#	tests/baselines/reference/es6modulekindWithES5Target.js
#	tests/baselines/reference/es6modulekindWithES5Target11.js
#	tests/baselines/reference/es6modulekindWithES5Target2.js
#	tests/baselines/reference/es6modulekindWithES5Target3.js
#	tests/baselines/reference/es6modulekindWithES5Target6.js
#	tests/cases/unittests/transpile.ts
#	tests/cases/unittests/tsserverProjectSystem.ts

2016-06-14 15:21:51 -07:00

..

baselines/reference

Merge branch 'master' into transforms

2016-06-14 15:21:51 -07:00

cases

[Transforms] Merge master 06/14/2016 (#9169)

2016-06-14 15:00:40 -07:00

lib

…

webhost

…

perfsys.ts

…

perftsc.ts

…

test.bat

…

webTestResults.html

…

webTestServer.ts

…