Merge branch 'master' into cpp-11

This commit is contained in:
Jonathan G Rennison
2019-02-04 18:09:36 +00:00
309 changed files with 13187 additions and 4835 deletions

View File

@@ -2700,12 +2700,12 @@
<ClInclude Include="..\src\blitter\8bpp_simple.hpp">
<Filter>Blitters</Filter>
</ClInclude>
<ClCompile Include="..\src\blitter\base.cpp">
<Filter>Blitters</Filter>
</ClCompile>
<ClInclude Include="..\src\blitter\base.hpp">
<Filter>Blitters</Filter>
</ClInclude>
<ClInclude Include="..\src\blitter\common.hpp">
<Filter>Blitters</Filter>
</ClInclude>
<ClInclude Include="..\src\blitter\factory.hpp">
<Filter>Blitters</Filter>
</ClInclude>