Mohamed Hegazy 25ce5db7f3 Merge branch 'master' into es6Typings ...

Conflicts:
	src/harness/harness.ts
	src/lib/core.d.ts

2014-11-17 11:15:46 -08:00

..

binder.ts

update comment.

2014-11-14 17:15:25 -08:00

checker.ts

Merge branch 'master' into warnaserror

2014-11-16 22:02:00 +01:00

commandLineParser.ts

Merge branch 'master' into warnaserror

2014-11-16 22:02:00 +01:00

core.ts

Merge branch 'master' into taggedTemplates

2014-11-04 15:24:21 -08:00

diagnosticInformationMap.generated.ts

Merge branch 'master' into warnaserror

2014-11-16 22:02:00 +01:00

diagnosticMessages.json

Merge branch 'master' into warnaserror

2014-11-16 22:02:00 +01:00

emitter.ts

Merge branch 'master' into warnaserror

2014-11-16 22:02:00 +01:00

parser.ts

Merge branch 'master' into es6Typings

2014-11-17 11:15:46 -08:00

scanner.ts

merge with master

2014-11-05 17:34:42 -08:00

sys.ts

Actually removed reference to the diagnostics file.

2014-10-23 13:43:22 -07:00

tsc.ts

Merge branch 'master' into es6Typings

2014-11-17 11:15:46 -08:00

types.ts

Merge branch 'master' into es6Typings

2014-11-17 11:15:46 -08:00