Merge remote-tracking branch 'origin/hotfix/quick_fixes' into development

This commit is contained in:
John Wellbelove 2019-09-23 19:46:22 +01:00
commit 5deaa666a6
2 changed files with 4 additions and 0 deletions

View File

@ -458,6 +458,7 @@
<ClInclude Include="..\..\include\etl\callback_service.h" />
<ClInclude Include="..\..\include\etl\largest_generator.h" />
<ClInclude Include="..\..\include\etl\absolute.h" />
<ClInclude Include="..\..\include\etl\macros.h" />
<ClInclude Include="..\..\include\etl\multi_array.h" />
<ClInclude Include="..\..\include\etl\negative.h" />
<ClInclude Include="..\..\include\etl\private\to_string_helper.h" />

View File

@ -765,6 +765,9 @@
<ClInclude Include="..\..\include\etl\basic_string.h">
<Filter>ETL\Strings</Filter>
</ClInclude>
<ClInclude Include="..\..\include\etl\macros.h">
<Filter>ETL\Utilities</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\main.cpp">