Home Explore Help
Sign In
cpp
/
urho3d
mirror of https://github.com/urho3d/urho3d.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Minor fix for SDL build on Raspberry Pi platform.

Yao Wei Tjong 姚伟忠 11 years ago
parent
bc5730680b
commit
591c8800b6
1 changed files with 0 additions and 1 deletions
Split View Show Diff Stats
  1. 0 1
      Source/ThirdParty/SDL/src/core/linux/SDL_evdev.c

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

@@ -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