diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-02-21 01:44:00 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-02-21 01:44:00 +0100 |
| commit | 1f0d58d69cb410cb937ee2f10e24cff1c451c779 (patch) | |
| tree | dc5b2604e526afa820afb04f30c85102ea552685 /vsprojects/vs2013/grpc.vcxproj | |
| parent | dda049ce18193dbd45478aa79e99a49be5d0f347 (diff) | |
| parent | fb7db9d60759ebd01c1098f60b665019c7de5a0c (diff) | |
Merge branch 'master' of github.com:google/grpc into unsecure-fix
Conflicts:
Makefile
build.json
vsprojects/vs2013/grpc.vcxproj
vsprojects/vs2013/grpc.vcxproj.filters
vsprojects/vs2013/grpc_shared.vcxproj
vsprojects/vs2013/grpc_shared.vcxproj.filters
vsprojects/vs2013/grpc_unsecure.vcxproj
vsprojects/vs2013/grpc_unsecure.vcxproj.filters
Diffstat (limited to 'vsprojects/vs2013/grpc.vcxproj')
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index 36eade99de..b55c7f926b 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -113,6 +113,7 @@ <ClInclude Include="..\..\src\core\channel\noop_filter.h" /> <ClInclude Include="..\..\src\core\compression\algorithm.h" /> <ClInclude Include="..\..\src\core\compression\message_compress.h" /> + <ClInclude Include="..\..\src\core\debug\trace.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" /> @@ -252,6 +253,8 @@ </ClCompile> <ClCompile Include="..\..\src\core\compression\message_compress.c"> </ClCompile> + <ClCompile Include="..\..\src\core\debug\trace.c"> + </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm_heap.c"> |