Skip to content

Commit c581fa4

Browse files
planetchiliplanetchili
committed
Merge branch 'feature/igcl-bw-upg' into release-gtd-external/rc2.3.0
2 parents 54e97ec + f3d02e9 commit c581fa4

33 files changed

+3934
-614
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,3 @@ PresentData/PresentData.args.json
4141
IntelPresentMon/SampleClient/log.txt
4242

4343
IntelPresentMon/PresentMonAPI2/Internal.h
44-
45-
IntelPresentMon/CommonUtilities/git_hash.h

‎IntelPresentMon/AppCef/CefNano.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383
<ProjectReference Include="..\Core\Core.vcxproj">
8484
<Project>{808f5ea9-ea09-4d72-87b4-5397d43cba54}</Project>
8585
</ProjectReference>
86+
<ProjectReference Include="..\Versioning\Versioning.vcxproj">
87+
<Project>{c73aa532-e532-4d93-9279-905444653c08}</Project>
88+
</ProjectReference>
8689
</ItemGroup>
8790
<ItemGroup>
8891
<ResourceCompile Include="AppCef.rc" />

‎IntelPresentMon/AppCef/Web/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)