Daniel Rosenwasser 735452c80b Merge branch 'master' into completionsInIncompleteConstructs ...

Conflicts:
	src/services/formatting/smartIndenter.ts
	src/services/services.ts

2015-03-17 12:39:37 -07:00

..

compiler

Merge branch 'master' of https://github.com/Microsoft/TypeScript into typeParameterFixing

2015-03-17 10:45:41 -07:00

conformance

Merge branch 'master' into emitClass

2015-03-16 15:55:57 -07:00

fourslash

Merge branch 'master' into completionsInIncompleteConstructs

2015-03-17 12:39:37 -07: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

Address code review

2015-03-16 15:48:03 -07:00