Ivo Gabe de Wolff 04dd08da70 Resolve missed merge conflict

2015-02-06 16:45:26 +01:00

..

binder.ts

Merge branch 'master' into taggedTemplates

2015-02-06 16:44:16 +01:00

checker.ts

Merge branch 'master' into taggedTemplates

2015-02-06 16:44:16 +01:00

commandLineParser.ts

Fix spelling of 'Filename' to be 'FileName'.

2015-02-03 16:08:46 -08:00

core.ts

CR feedback.

2015-02-05 17:24:46 -08:00

diagnosticInformationMap.generated.ts

Merge branch 'master' into taggedTemplates

2015-02-06 16:44:16 +01:00

diagnosticMessages.json

Merge branch 'master' into taggedTemplates

2015-02-06 16:44:16 +01:00

emitter.ts

Resolve missed merge conflict

2015-02-06 16:45:26 +01:00

parser.ts

Remove unnecessary diagnostics split on SourceFile.

2015-02-05 13:38:11 -08:00

program.ts

CR feedback.

2015-02-05 17:24:46 -08:00

scanner.ts

resolve merge conflicts

2015-01-22 11:23:27 -08:00

sys.ts

Ignore symbolic links when enumerating directories

2015-01-20 09:58:25 -08:00

tsc.ts

Simplify the API for emitting and reporting exit statuses to callers.

2015-02-05 15:50:18 -08:00

tsconfig.json

Adding src/compiler/tsconfig.json and src/services/tsconfig.json

2015-01-20 16:28:57 -08:00

types.ts

Remove getEnumMemberValue, it is now subsumed into getConstantValue.

2015-02-05 18:26:56 -08:00

utilities.ts

Extract common function.

2015-02-05 18:11:21 -08:00