Resolve conflicts with master

This commit is contained in:
numzero
2023-03-25 10:42:11 +03:00
55 changed files with 474 additions and 7166 deletions

View File

@ -243,7 +243,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
#endif
if (SDL_Init(flags) < 0)
{
os::Printer::log( "Unable to initialize SDL!", SDL_GetError());
os::Printer::log("Unable to initialize SDL!", SDL_GetError());
Close = true;
}
else