Merge branch 'master' into opengl3

diff --cc include/irrUString.h
Simple merge

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

diff --cc source/Irrlicht/CIrrDeviceSDL.cpp
index ecd8a8da1352bdcceb66bfe9e1275eb75e4748f6,1af434b8ce015ac6ee6622dec3069271c0f1ea8a..b0c774797be01d5793304d12c05a187e9bae9b1a
--- 1/source/Irrlicht/CIrrDeviceSDL.cpp
--- 2/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/source/Irrlicht/CIrrDeviceSDL.cpp
@@@ -344,16 -344,6 +344,19 @@@ void CIrrDeviceSDL::logAttributes(
  \r
  bool CIrrDeviceSDL::createWindow()\r
  {\r
-       } else  {\r
-               if (Resizable)\r
-                       SDL_Flags |= SDL_WINDOW_RESIZABLE;\r
-               if (CreationParams.WindowMaximized)\r
-                       SDL_Flags |= SDL_WINDOW_MAXIMIZED;\r
 +      if (CreationParams.Fullscreen) {\r
++#ifdef _IRR_EMSCRIPTEN_PLATFORM_\r
 +              SDL_Flags |= SDL_WINDOW_FULLSCREEN;\r
++#else\r
++              SDL_Flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;\r
++#endif\r
 +      }\r
++      if (Resizable)\r
++              SDL_Flags |= SDL_WINDOW_RESIZABLE;\r
++      if (CreationParams.WindowMaximized)\r
++              SDL_Flags |= SDL_WINDOW_MAXIMIZED;\r
 +      SDL_Flags |= SDL_WINDOW_OPENGL;\r
 +\r
  #ifdef _IRR_EMSCRIPTEN_PLATFORM_\r
        if ( Width != 0 || Height != 0 )\r
                emscripten_set_canvas_size( Width, Height);\r