Merge branch 'development'

# Conflicts:
#	test/vs2019/etl.vcxproj
#	test/vs2019/etl.vcxproj.filters
This commit is contained in:
John Wellbelove 2022-01-23 15:25:37 +00:00
commit 47210b5815
2 changed files with 2 additions and 2 deletions

View File

@ -9572,4 +9572,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@ -3326,4 +3326,4 @@
<Filter>Resource Files</Filter>
</Natvis>
</ItemGroup>
</Project>
</Project>