Cyrus Najmabadi 0391e02fee Merge branch 'master' into sourceFileUpdate ...

Conflicts:
	src/compiler/parser.ts
	src/services/formatting/tokenSpan.ts
	src/services/text.ts

2014-12-11 18:08:57 -08:00

..

compiler

Merge branch 'master' into sourceFileUpdate

2014-12-11 18:08:57 -08:00

conformance

Merge pull request #1341 from Microsoft/escapingTheTemplateOfDoom

2014-12-10 16:29:00 -08:00

fourslash

Merge branch 'master' into funcDeclsInBlocks

2014-12-11 14:59:03 -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

test262-harness

Add the test262 helper file

2014-11-27 13:06:06 -08:00

unittests

Merge branch 'funcDeclsInBlocks' into sourceFileUpdate

2014-12-11 15:16:46 -08:00