Mohamed Hegazy d3e70ecfbf Merge branch 'master' into es6typings ...

Conflicts:
	src/compiler/parser.ts
	src/compiler/tsc.ts
	src/harness/harness.ts
	src/harness/projectsRunner.ts
	tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt

2014-11-27 09:59:46 -08:00

..

compiler

Merge branch 'master' into es6typings

2014-11-27 09:59:46 -08:00

conformance

Add an _es6 suffix to prevent name collisions.

2014-11-24 22:53:55 -08:00

fourslash

Merge branch 'master' into taggedSigHelp

2014-11-24 16:34:00 -08:00

fourslash_old

Removed tests from fourslash_old that were duplicates.

2014-11-19 12:03:25 -08:00

project

Remove the --noResolve check when finding the file.

2014-11-20 15:43:07 -08:00

projects

Remove the --noResolve check when finding the file.

2014-11-20 15:43:07 -08:00

unittests/services

eliminate usage of TypeScript module from services layer

2014-11-17 17:01:23 -08:00