Jason Freeman 22e989795d Merge branch 'master' into sigHelp ... Conflicts: src/compiler/checker.ts src/compiler/types.ts src/services/services.ts		2014-09-24 10:47:41 -07:00
..
compiler	Added protected conformance tests	2014-09-23 11:22:38 -07:00
conformance	fix comment text	2014-09-23 13:44:39 -07:00
fourslash	Merge branch 'master' into sigHelp	2014-09-24 10:47:41 -07:00
fourslash_old	Moved old fourslash test for brace matching over from fourslash_old.	2014-09-22 11:12:56 -07:00
project
projects
unittests/services	Changed wording for unit tests.	2014-09-23 14:14:27 -07:00