Yui T 9ab59a4964 Merge branch 'master' into refactorGrammarCheck
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/parser.ts
	src/compiler/types.ts
	tests/baselines/reference/YieldExpression8_es6.errors.txt
	tests/baselines/reference/ambientErrors.errors.txt
	tests/baselines/reference/giant.errors.txt
2014-12-16 17:38:40 -08:00
..