Merge remote-tracking branch 'origin/development'

This commit is contained in:
John Wellbelove 2017-12-22 11:15:30 +00:00
commit a00cab9cfc
3 changed files with 8 additions and 0 deletions

View File

@ -1,3 +1,7 @@
10.8.1
Pool
Changed alignof to etl::alignment_of
10.8.0
Added etl::variant_pool as a replacement for etl::factory.

View File

@ -472,6 +472,7 @@
</ItemGroup>
<ItemGroup>
<Text Include="..\..\src\file_error_numbers.txt" />
<Text Include="..\..\support\Release notes.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -969,5 +969,8 @@
<Text Include="..\..\src\file_error_numbers.txt">
<Filter>Resource Files</Filter>
</Text>
<Text Include="..\..\support\Release notes.txt">
<Filter>Resource Files</Filter>
</Text>
</ItemGroup>
</Project>