Merge branch 'cpp-11' into save_ext

# Conflicts: # src/saveload/saveload.cpp # src/saveload/saveload.h
2019-02-04 18:24:38 +00:00
parent 02e2627765 09c62d6951
commit 46b5b0155c
280 changed files with 11624 additions and 3855 deletions
--- a/source.list
+++ b/source.list
@@ -955,8 +955,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