Commit 51d6471

committed

Merge remote-tracking branch 'refs/remotes/origin/typescript' into develop

2 parents dafe3c5 + d2947e3 commit 51d6471Copy full SHA for 51d6471

File tree

+1572

-1088

lines changed

+1572

-1088

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 35 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,33 +1,35 @@`
`1`		`-# Logs`
`2`		`-logs`
`3`		`-*.log`
`4`		`-npm-debug.log*`
`5`		`-`
`6`		`-# Runtime data`
`7`		`-pids`
`8`		`-*.pid`
`9`		`-*.seed`
`10`		`-`
`11`		`-# Directory for instrumented libs generated by jscoverage/JSCover`
`12`		`-lib-cov`
`13`		`-`
`14`		`-# Coverage directory used by tools like istanbul`
`15`		`-coverage`
`16`		`-`
`17`		`-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)`
`18`		`-.grunt`
`19`		`-`
`20`		`-# node-waf configuration`
`21`		`-.lock-wscript`
`22`		`-`
`23`		`-# Compiled binary addons (http://nodejs.org/api/addons.html)`
`24`		`-build/Release`
`25`		`-`
`26`		`-# Dependency directory`
`27`		`-node_modules`
`28`		`-`
`29`		`-# Optional npm cache directory`
`30`		`-.npm`
`31`		`-`
`32`		`-# Optional REPL history`
`33`		`-.node_repl_history`
	`1`	`+# See http://help.github.com/ignore-files/ for more about ignoring files.`
	`2`	`+`
	`3`	`+# compiled output`
	`4`	`+# /dist`
	`5`	`+/tmp`
	`6`	`+`
	`7`	`+# dependencies`
	`8`	`+/node_modules`
	`9`	`+/bower_components`
	`10`	`+`
	`11`	`+# IDEs and editors`
	`12`	`+/.idea`
	`13`	`+/.vscode`
	`14`	`+.editorconfig`
	`15`	`+.project`
	`16`	`+.classpath`
	`17`	`+*.launch`
	`18`	`+.settings/`
	`19`	`+`
	`20`	`+# misc`
	`21`	`+/.sass-cache`
	`22`	`+/connect.lock`
	`23`	`+/coverage/*`
	`24`	`+/libpeerconnection.log`
	`25`	`+npm-debug.log`
	`26`	`+testem.log`
	`27`	`+/typings`
	`28`	`+`
	`29`	`+# e2e`
	`30`	`+/e2e/*.js`
	`31`	`+/e2e/*.map`
	`32`	`+`
	`33`	`+#System Files`
	`34`	`+.DS_Store`
	`35`	`+Thumbs.db`

Lines changed: 0 additions & 25 deletions

This file was deleted.

Lines changed: 4 additions & 0 deletions

Comments

(0)