Resolve conflicts with master

[irrlicht.git] / include / SIrrCreationParameters.h

diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h
index 743960489bcdd504023570537d288e7b4c7ca6a3..1ac150bbac4da1aadd9a5f4fe881e974ab68a528 100644 (file)
--- a/include/SIrrCreationParameters.h
+++ b/include/SIrrCreationParameters.h
@@ -235,7 +235,6 @@ namespace irr
                /** If this is set to a value other than 0, the Irrlicht Engine\r
                will be created in an already existing window.\r
                For Windows, set this to the HWND of the window you want.\r
-               For iOS, assign UIView to this variable.\r
                The windowSize and FullScreen options will be ignored when using\r
                the WindowId parameter. Default this is set to 0.\r
                To make Irrlicht run inside the custom window, you still will\r