Vladimir Matveev 08f446ddf7 resolve merge conflicts

2014-09-16 11:27:58 -07:00

..

binder.ts

…

checker.ts

…

commandLineParser.ts

…

core.ts

…

diagnosticInformationMap.generated.ts

…

diagnosticMessages.json

…

emitter.ts

…

parser.ts

resolve merge conflicts

2014-09-16 11:27:58 -07:00

scanner.ts

…

sys.ts

…

tsc.ts

…

types.ts

merge with master

2014-09-16 11:24:00 -07:00