2 commits

Author	SHA1	Message	Date
Anders Hejlsberg	f0f4ca6b06	Merge branch 'master' into es6Import ... Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json src/compiler/emitter.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 tests/baselines/reference/recursiveClassReferenceTest.js.map tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt	2015-02-23 11:15:56 -08:00
Anders Hejlsberg	67874b4c9e	Accepting new baselines	2015-02-09 11:23:32 -08:00