https://github.com/Microsoft/TypeScript
Revision 1dfcc3ec0eabb8aa7b6abdef287b8ce905eb060f authored by Cyrus Najmabadi on 06 July 2015, 22:19:57 UTC, committed by Cyrus Najmabadi on 06 July 2015, 22:19:57 UTC
Conflicts:
	src/services/services.ts
	src/services/shims.ts
2 parent s c9c0f3a + e009d68
History
Tip revision: 1dfcc3ec0eabb8aa7b6abdef287b8ce905eb060f authored by Cyrus Najmabadi on 06 July 2015, 22:19:57 UTC
Merge branch 'master' into cancellableDiagnostics
Tip revision: 1dfcc3e
File Mode Size
.settings
bin
doc
scripts
src
tests
.editorconfig -rw-r--r-- 188 bytes
.gitattributes -rw-r--r-- 42 bytes
.gitignore -rw-r--r-- 1.1 KB
.npmignore -rw-r--r-- 59 bytes
.travis.yml -rw-r--r-- 51 bytes
CONTRIBUTING.md -rw-r--r-- 5.7 KB
CopyrightNotice.txt -rw-r--r-- 834 bytes
Jakefile.js -rw-r--r-- 26.1 KB
LICENSE.txt -rw-r--r-- 9.0 KB
README.md -rw-r--r-- 4.0 KB
ThirdPartyNoticeText.txt -rw-r--r-- 3.4 KB
package.json -rw-r--r-- 1002 bytes

README.md

back to top