Jason Freeman 111fdcb499 Merge branch 'release-1.5' ...

Conflicts:
	src/compiler/emitter.ts
	src/compiler/parser.ts
	src/compiler/program.ts
	src/services/services.ts
	tests/cases/unittests/transpile.ts

2015-06-18 15:06:03 -07:00

..

compiler

Merge branch 'release-1.5'

2015-06-18 15:06:03 -07:00

conformance

Fixes type predicate crash bug

2015-06-18 23:04:05 +08:00

fourslash

Scan less during classification.

2015-06-16 16:07:24 -07:00

fourslash_old

…

project

Add rootDir tests

2015-04-14 22:19:59 -07:00

projects

Modified test, updated baselines.

2015-05-06 16:37:59 -07:00

test262-harness

…

unittests

Merge branch 'release-1.5'

2015-06-18 15:06:03 -07:00