diff options
| author | Lourens-Rich <lourens@openmailbox.org> | 2018-09-11 19:09:02 +0300 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2018-09-23 14:03:05 +0200 |
| commit | 65af7d2fb6a7e9537dedfb9d11e93c929030d71b (patch) | |
| tree | 4143aa00179dac7d85b050a1b995b898b2d17b2e | |
| parent | 785f68ef3366e93c17f190535ba5604896fcf21c (diff) | |
| download | minetest-65af7d2fb6a7e9537dedfb9d11e93c929030d71b.tar.gz minetest-65af7d2fb6a7e9537dedfb9d11e93c929030d71b.tar.bz2 minetest-65af7d2fb6a7e9537dedfb9d11e93c929030d71b.zip | |
Fix "Hunk #1 FAILED at 9 (different line endings)."
| -rw-r--r-- | build/android/patches/irrlicht-native_activity.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/build/android/patches/irrlicht-native_activity.patch b/build/android/patches/irrlicht-native_activity.patch index 83c837886..a9d2610c3 100644 --- a/build/android/patches/irrlicht-native_activity.patch +++ b/build/android/patches/irrlicht-native_activity.patch @@ -1,13 +1,13 @@ ---- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2018-06-10 16:58:11.357709173 +0200 -+++ irrlicht/source/Irrlicht/CEGLManager.cpp 2018-06-10 16:58:25.100709843 +0200 +--- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2018-09-11 18:19:51.453403631 +0300 ++++ irrlicht/source/Irrlicht/CEGLManager.cpp 2018-09-11 18:36:24.603471869 +0300 @@ -9,6 +9,10 @@ - #include "irrString.h" - #include "os.h" - -+#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) -+#include <android/native_activity.h> -+#endif -+ - namespace irr - { - namespace video + #include "irrString.h"
+ #include "os.h"
+
++#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)
++#include <android/native_activity.h>
++#endif
++
+ namespace irr
+ {
+ namespace video
|