diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-09-07 10:40:13 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-09-07 10:40:13 -0700 |
| commit | c1c691fdb1545f601afe843c5820a45a630d25fc (patch) | |
| tree | bd9be793d884122854d309cb03c8aa149634aecc /vsprojects/vcxproj | |
| parent | 344834b40b10a646b73f2484114f338512490cf0 (diff) | |
Fix merge error
Diffstat (limited to 'vsprojects/vcxproj')
| -rw-r--r-- | vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj b/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj index adfbaf6fad..01342868b0 100644 --- a/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj @@ -162,6 +162,14 @@ </ClCompile> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr_test_util\gpr_test_util.vcxproj"> + <Project>{EAB0A629-17A9-44DB-B5FF-E91A721FE037}</Project> + </ProjectReference> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> + <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> <None Include="packages.config" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |