Merge branch 'master' into release-0.9.7

Conflicts:
	package.json
This commit is contained in:
vvakame
2014-02-25 11:10:36 +09:00
32 changed files with 671 additions and 86 deletions

View File

@@ -1,7 +1,8 @@
{
"private": true,
"name": "DefinitelyTyped",
"version": "0.0.0",
"scripts": {
"test": "node ./_infrastructure/tests/runner.js --tsc-version 0.9.7-59a846"
}
"scripts": {
"test": "node ./_infrastructure/tests/runner.js --tsc-version 0.9.7-59a846"
}
}