Commit graph

3 commits

Author SHA1 Message Date
Mohamed Hegazy 55aa240ade Merge branch 'master' into LSAPICleanup
Conflicts:
	src/services/services.ts
2015-02-06 17:17:23 -08:00
Mohamed Hegazy 40a01a81b3 Merge branch 'master' into fourslashCleanup
Conflicts:
	src/harness/fourslash.ts
	src/harness/harnessLanguageService.ts
2015-02-04 20:22:00 -08:00
Mohamed Hegazy bfef4a0365 Add new tests for shims 2015-02-04 15:36:13 -08:00