Merge branch 'master' of https://github.com/tritium21/node-irc-dcc

tritium21 · Sep 2, 2016 · 1c3d32f · 1c3d32f
2 parents 96b6c1a + 93b713c
commit 1c3d32f
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 4,228 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ bin/
 obj/
 docs/_build/
 coverage/
+typings/
diff --git a/node-irc-dcc.njsproj b/node-irc-dcc.njsproj
@@ -60,9 +60,6 @@
     <Folder Include="example" />
     <Folder Include="lib" />
     <Folder Include="test\" />
-    <Folder Include="typings\" />
-    <Folder Include="typings\globals\" />
-    <Folder Include="typings\globals\ip\" />
     <Folder Include="typings\globals\irc\" />
     <Folder Include="typings\globals\istanbul\" />
     <Folder Include="typings\globals\mocha\" />
@@ -71,7 +68,6 @@
     <Folder Include="typings\globals\simple-mock\" />
   </ItemGroup>
   <ItemGroup>
-    <TypeScriptCompile Include="typings\globals\ip\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\irc\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\istanbul\index.d.ts" />
     <TypeScriptCompile Include="typings\globals\mocha\index.d.ts" />

diff --git a/typings/globals/ip/index.d.ts b/typings/globals/ip/index.d.ts
diff --git a/typings/globals/ip/typings.json b/typings/globals/ip/typings.json