Merge branch 'master' into cpp-11

2019-02-04 18:09:36 +00:00
parent d86aa7719b 33e3f49161
commit 09c62d6951
309 changed files with 13187 additions and 4835 deletions
--- a/source.list
+++ b/source.list
@@ -951,8 +951,8 @@ blitter/8bpp_optimized.hpp
 blitter/8bpp_simple.cpp
 blitter/8bpp_simple.hpp
 #end
-blitter/base.cpp
 blitter/base.hpp
+blitter/common.hpp
 blitter/factory.hpp
 blitter/null.cpp
 blitter/null.hpp