Resolve conflicts with master

diff --cc examples/AutomatedTest/main.cpp
Simple merge

diff --cc include/IVideoDriver.h
Simple merge

diff --cc include/SIrrCreationParameters.h
Simple merge

diff --cc source/Irrlicht/CIrrDeviceSDL.cpp
Simple merge

diff --cc source/Irrlicht/CMakeLists.txt
index fa345cadd46871b6912ac393ede037caf4dc5df5,e993ace12d1b403ed6360384e92aaf4036a6d073..ad11dd45aa46adfc4aace25eee6cabf6cd3b4ce3
--- 1/source/Irrlicht/CMakeLists.txt
--- 2/source/Irrlicht/CMakeLists.txt
+++ b/source/Irrlicht/CMakeLists.txt
@@@ -148,9 -140,7 +139,9 @@@ endif(
  
  # OpenGL
  
- if(IOS OR ANDROID OR EMSCRIPTEN)
 +option(ENABLE_OPENGL3 "Enable OpenGL 3+" FALSE)
 +
+ if(ANDROID OR EMSCRIPTEN)
        set(ENABLE_OPENGL FALSE)
  else()
        option(ENABLE_OPENGL "Enable OpenGL" TRUE)
@@@ -219,11 -196,6 +208,9 @@@ if(ENABLE_GLES2
        add_definitions(-D_IRR_COMPILE_WITH_OGLES2_)
        if(DEVICE MATCHES "^(WINDOWS|X11|ANDROID)$" OR EMSCRIPTEN)
                add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_ -D_IRR_OGLES2_USE_EXTPOINTER_)
-       elseif(DEVICE STREQUAL "IOS")
-               add_definitions(-D_IRR_COMPILE_WITH_EAGL_MANAGER_)
 +      elseif(DEVICE STREQUAL "SDL")
 +              set(USE_SDLGL ON)
 +              set(USE_SDLGLES2 ON)
        endif()
  endif()
  

diff --cc source/Irrlicht/CNullDriver.cpp
Simple merge

diff --cc source/Irrlicht/CNullDriver.h
Simple merge

diff --cc source/Irrlicht/Irrlicht.cpp
Simple merge