Bläddra i källkod

Minor fix for SDL build on Raspberry Pi platform.

Yao Wei Tjong 姚伟忠 11 år sedan
förälder
incheckning
591c8800b6
1 ändrade filer med 0 tillägg och 1 borttagningar
  1. 0 1
      Source/ThirdParty/SDL/src/core/linux/SDL_evdev.c

+ 0 - 1
Source/ThirdParty/SDL/src/core/linux/SDL_evdev.c

@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-<<<<<<< HEAD:src/input/evdev/SDL_evdev.c
 
 // Modified by OvermindDL1 for Urho3D