Resolve conflicts with master

[irrlicht.git] / include / SIrrCreationParameters.h

diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h
index 5c1f8da9293a3eb2fec5abc5ff2661dc5fdea030..1ac150bbac4da1aadd9a5f4fe881e974ab68a528 100644 (file)
--- a/include/SIrrCreationParameters.h
+++ b/include/SIrrCreationParameters.h
@@ -24,7 +24,7 @@ namespace irr
                //! Constructs a SIrrlichtCreationParameters structure with default values.\r
                SIrrlichtCreationParameters() :\r
                        DeviceType(EIDT_BEST),\r
-                       DriverType(video::EDT_BURNINGSVIDEO),\r
+                       DriverType(video::EDT_OPENGL),\r
                        WindowSize(core::dimension2d<u32>(800, 600)),\r
                        WindowPosition(core::position2di(-1,-1)),\r
                        Bits(32),\r