aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects/vcxproj/test
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2016-06-09 11:02:10 -0700
committerGravatar Yuchen Zeng <zyc@google.com>2016-06-09 11:02:10 -0700
commitd7a15b86b738f94f8f68884290d6c0d7c428979c (patch)
tree78158df86679a23b43956ad133b05579698f025a /vsprojects/vcxproj/test
parent0a0c1b0d59341e2535e27d86f1cd61f6c114b2ed (diff)
parent1bc2976a0f51e14d3525aecbf4b3450445ed2d1b (diff)
Merge remote-tracking branch 'upstream/master' into base64_decode
Diffstat (limited to 'vsprojects/vcxproj/test')
-rw-r--r--vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj5
-rw-r--r--vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj.filters8
2 files changed, 0 insertions, 13 deletions
diff --git a/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj b/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj
index 3884c10236..d1dea3ec4a 100644
--- a/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj
+++ b/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj
@@ -160,11 +160,6 @@
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\parse_json.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\parse_json.cc">
- </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\cpp\qps\qps_json_driver.cc">
</ClCompile>
</ItemGroup>
diff --git a/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj.filters b/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj.filters
index cde967fc27..62b9be85cc 100644
--- a/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj.filters
+++ b/vsprojects/vcxproj/test/qps_json_driver/qps_json_driver.vcxproj.filters
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\parse_json.cc">
- <Filter>test\cpp\qps</Filter>
- </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\cpp\qps\qps_json_driver.cc">
<Filter>test\cpp\qps</Filter>
</ClCompile>
</ItemGroup>
- <ItemGroup>
- <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\parse_json.h">
- <Filter>test\cpp\qps</Filter>
- </ClInclude>
- </ItemGroup>
<ItemGroup>
<Filter Include="test">