diff options
| author | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:11 +0300 |
|---|---|---|
| committer | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:47 +0300 |
| commit | d97d1708d68a98c039db8a06c4110bfc961d3fb1 (patch) | |
| tree | 1a90cd7a34793982aa9376468feb41e67d2b7cdc /include/EDeviceTypes.h | |
| parent | ba77d01c91a363ad932ecd26c3eaba82ddf7a6f0 (diff) | |
| parent | 799c8b936f9a2cc4f3a8bc56237fb9a8dedf853e (diff) | |
| download | irrlicht-d97d1708d68a98c039db8a06c4110bfc961d3fb1.tar.xz | |
Resolve conflicts with master
Diffstat (limited to 'include/EDeviceTypes.h')
| -rw-r--r-- | include/EDeviceTypes.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/EDeviceTypes.h b/include/EDeviceTypes.h index a0c1ca7..853e825 100644 --- a/include/EDeviceTypes.h +++ b/include/EDeviceTypes.h @@ -24,10 +24,6 @@ namespace irr //! A device native to Mac OSX
/** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */
EIDT_OSX,
-
- //! A device native to the iOS
- /** This device should be used with the OpenGL-ES driver. */
- EIDT_IOS,
//! A device which uses Simple DirectMedia Layer
/** The SDL device works under all platforms supported by SDL but first must be compiled
|