fixed faulty merge
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
index e308a03..08d18f4 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@@ -277,9 +277,6 @@
<ClInclude Include="..\..\..\src\core\httpcli\format_request.h" />
<ClInclude Include="..\..\..\src\core\httpcli\httpcli.h" />
<ClInclude Include="..\..\..\src\core\httpcli\parser.h" />
- <ClInclude Include="..\..\..\src\core\iomgr\alarm.h" />
- <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h" />
- <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h" />
<ClInclude Include="..\..\..\src\core\iomgr\closure.h" />
<ClInclude Include="..\..\..\src\core\iomgr\endpoint.h" />
<ClInclude Include="..\..\..\src\core\iomgr\endpoint_pair.h" />
@@ -307,6 +304,9 @@
<ClInclude Include="..\..\..\src\core\iomgr\tcp_server.h" />
<ClInclude Include="..\..\..\src\core\iomgr\tcp_windows.h" />
<ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h" />
+ <ClInclude Include="..\..\..\src\core\iomgr\timer.h" />
+ <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h" />
+ <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h" />
<ClInclude Include="..\..\..\src\core\iomgr\udp_server.h" />
<ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_pipe.h" />
<ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_posix.h" />
@@ -428,10 +428,6 @@
</ClCompile>
<ClCompile Include="..\..\..\src\core\httpcli\parser.c">
</ClCompile>
- <ClCompile Include="..\..\..\src\core\iomgr\alarm.c">
- </ClCompile>
- <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c">
- </ClCompile>
<ClCompile Include="..\..\..\src\core\iomgr\closure.c">
</ClCompile>
<ClCompile Include="..\..\..\src\core\iomgr\endpoint.c">
@@ -492,6 +488,10 @@
</ClCompile>
<ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c">
</ClCompile>
+ <ClCompile Include="..\..\..\src\core\iomgr\timer.c">
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c">
+ </ClCompile>
<ClCompile Include="..\..\..\src\core\iomgr\udp_server.c">
</ClCompile>
<ClCompile Include="..\..\..\src\core\iomgr\wakeup_fd_eventfd.c">
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
index 370d1f6..daec33d 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -103,12 +103,6 @@
<ClCompile Include="..\..\..\src\core\httpcli\parser.c">
<Filter>src\core\httpcli</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\core\iomgr\alarm.c">
- <Filter>src\core\iomgr</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c">
- <Filter>src\core\iomgr</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\core\iomgr\closure.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -199,6 +193,12 @@
<ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\core\iomgr\timer.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c">
+ <Filter>src\core\iomgr</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\src\core\iomgr\udp_server.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -497,15 +497,6 @@
<ClInclude Include="..\..\..\src\core\httpcli\parser.h">
<Filter>src\core\httpcli</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\core\iomgr\alarm.h">
- <Filter>src\core\iomgr</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h">
- <Filter>src\core\iomgr</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h">
- <Filter>src\core\iomgr</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\core\iomgr\closure.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -587,6 +578,15 @@
<ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\core\iomgr\timer.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h">
+ <Filter>src\core\iomgr</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\src\core\iomgr\udp_server.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>