summaryrefslogtreecommitdiff
path: root/windows/ZeroTierOne
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-26 15:02:20 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-26 15:02:20 -0800
commit7c3984413eb62606dd8b2e9abda6f8a77a0770fc (patch)
tree61a0ccee26b316c167bd19c7df088add8f77ab88 /windows/ZeroTierOne
parent967ce78a571d3fe1193436c4c77a8ada423ea3c1 (diff)
parent923d3f1fe8f4b61b95043813b79e73e2974a54de (diff)
downloadinfinitytier-7c3984413eb62606dd8b2e9abda6f8a77a0770fc.tar.gz
infinitytier-7c3984413eb62606dd8b2e9abda6f8a77a0770fc.zip
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'windows/ZeroTierOne')
-rw-r--r--windows/ZeroTierOne/ZeroTierOne.vcxproj2
-rw-r--r--windows/ZeroTierOne/ZeroTierOne.vcxproj.filters6
2 files changed, 0 insertions, 8 deletions
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index 6a2ca520..7afdfb17 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -66,7 +66,6 @@
<ClCompile Include="..\..\one.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\..\osdep\BackgroundResolver.cpp" />
<ClCompile Include="..\..\osdep\Http.cpp" />
<ClCompile Include="..\..\osdep\ManagedRoute.cpp" />
<ClCompile Include="..\..\osdep\OSUtils.cpp" />
@@ -142,7 +141,6 @@
<ClInclude Include="..\..\node\Topology.hpp" />
<ClInclude Include="..\..\node\Utils.hpp" />
<ClInclude Include="..\..\node\World.hpp" />
- <ClInclude Include="..\..\osdep\BackgroundResolver.hpp" />
<ClInclude Include="..\..\osdep\Binder.hpp" />
<ClInclude Include="..\..\osdep\Http.hpp" />
<ClInclude Include="..\..\osdep\ManagedRoute.hpp" />
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
index ff3d4821..da673f61 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
@@ -165,9 +165,6 @@
<ClCompile Include="ZeroTierOneService.cpp">
<Filter>Source Files\windows\ZeroTierOne</Filter>
</ClCompile>
- <ClCompile Include="..\..\osdep\BackgroundResolver.cpp">
- <Filter>Source Files\osdep</Filter>
- </ClCompile>
<ClCompile Include="..\..\node\Path.cpp">
<Filter>Source Files\node</Filter>
</ClCompile>
@@ -398,9 +395,6 @@
<ClInclude Include="ZeroTierOneService.h">
<Filter>Header Files\windows\ZeroTierOne</Filter>
</ClInclude>
- <ClInclude Include="..\..\osdep\BackgroundResolver.hpp">
- <Filter>Header Files\osdep</Filter>
- </ClInclude>
<ClInclude Include="..\..\node\BinarySemaphore.hpp">
<Filter>Header Files\node</Filter>
</ClInclude>