Mohamed Hegazy
|
fad889283e
|
Merge branch 'master' into exportEqualsMerged
Conflicts:
src/compiler/checker.ts
src/compiler/emitter.ts
src/compiler/types.ts
tests/baselines/reference/APISample_compile.js
tests/baselines/reference/APISample_linter.js
tests/baselines/reference/APISample_transform.js
tests/baselines/reference/APISample_watcher.js
tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
tests/baselines/reference/es6ExportAllInEs5.js
tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
|
2015-03-25 00:06:38 -07:00 |
|
