]> git.lizzy.rs Git - irrlicht.git/commit
Resolve conflicts with master
authornumzero <numzer0@yandex.ru>
Sat, 25 Mar 2023 07:42:11 +0000 (10:42 +0300)
committernumzero <numzer0@yandex.ru>
Sat, 25 Mar 2023 07:42:47 +0000 (10:42 +0300)
commitd97d1708d68a98c039db8a06c4110bfc961d3fb1
tree1a90cd7a34793982aa9376468feb41e67d2b7cdc
parentba77d01c91a363ad932ecd26c3eaba82ddf7a6f0
parent799c8b936f9a2cc4f3a8bc56237fb9a8dedf853e
Resolve conflicts with master
examples/AutomatedTest/main.cpp
include/IVideoDriver.h
include/SIrrCreationParameters.h
source/Irrlicht/CIrrDeviceSDL.cpp
source/Irrlicht/CMakeLists.txt
source/Irrlicht/CNullDriver.cpp
source/Irrlicht/CNullDriver.h
source/Irrlicht/Irrlicht.cpp