Merge branch 'yawn' into proto_names

1 files changed, 27 insertions, 27 deletions

diff --git a/vsprojects/vcxproj/qps/qps.vcxproj.filters b/vsprojects/vcxproj/qps/qps.vcxproj.filters
index 1e416ba4e6..f575eae6ca 100644
--- a/vsprojects/vcxproj/qps/qps.vcxproj.filters
+++ b/vsprojects/vcxproj/qps/qps.vcxproj.filters
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.proto">
+    <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.proto">
       <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\proto\grpc\testing\control.proto">
+    <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\control.proto">
       <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\proto\grpc\testing\payloads.proto">
+    <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\payloads.proto">
       <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\proto\grpc\testing\services.proto">
+    <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\services.proto">
       <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\proto\grpc\testing\stats.proto">
+    <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\stats.proto">
       <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\proto\grpc\testing\perf_db.proto">
+    <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\perf_db.proto">
       <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\client_async.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\client_async.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\client_sync.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\client_sync.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\driver.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\driver.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\perf_db_client.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\perf_db_client.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\qps_worker.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\qps_worker.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\report.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\report.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\server_async.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\server_async.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\server_sync.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\server_sync.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\qps\timer.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\timer.cc">
       <Filter>test\cpp\qps</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\cpp\util\benchmark_config.cc">
+    <ClCompile Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.cc">
       <Filter>test\cpp\util</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\test\cpp\qps\client.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\client.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\driver.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\driver.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\histogram.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\histogram.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\interarrival.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\interarrival.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\perf_db_client.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\perf_db_client.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\qps_worker.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\qps_worker.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\report.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\report.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\server.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\server.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\stats.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\stats.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\qps\timer.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\timer.h">
       <Filter>test\cpp\qps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\test\cpp\util\benchmark_config.h">
+    <ClInclude Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.h">
       <Filter>test\cpp\util</Filter>
     </ClInclude>
   </ItemGroup>