Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
beb72f40573a5f72672fe7f4b1e5e2256e328a09
TypeScript/src
T
History
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
..
compiler
[Transforms] Merge master 06/14/2016 (#9169)
2016-06-14 15:00:40 -07:00
harness
Merge branch 'master' into transforms
2016-06-14 15:21:51 -07:00
lib
[Transforms] Merge master 06/06/2016 (#8991)
2016-06-14 11:36:57 -07:00
server
[Transforms] Merge master 06/14/2016 (#9169)
2016-06-14 15:00:40 -07:00
services
Merge branch 'master' into transforms
2016-06-14 15:21:51 -07:00