EFL core migration revision 68518

Merge remote-tracking branch 'origin/upstream'

Conflicts:
	src/lib/canvas/evas_render.c
	src/modules/engines/gl_x11/evas_engine.c
	src/modules/loaders/gif/evas_image_load_gif.c

diff --cc m4/evas_check_engine.m4
Simple merge

diff --cc src/lib/canvas/evas_object_image.c
index 869af50,4ebea08..83ef7c0
mode 100755,100644..100755
--- 1/src/lib/canvas/evas_object_image.c
--- 2/src/lib/canvas/evas_object_image.c
+++ b/src/lib/canvas/evas_object_image.c

diff --cc src/lib/canvas/evas_render.c
Simple merge

diff --cc src/modules/engines/gl_common/evas_gl_line.c
index 6e616c8,f8ace2e..cd94285
--- 1/src/modules/engines/gl_common/evas_gl_line.c
--- 2/src/modules/engines/gl_common/evas_gl_line.c
+++ b/src/modules/engines/gl_common/evas_gl_line.c
@@@ -17,10 -17,13 +17,13 @@@ evas_gl_common_line_draw(Evas_Engine_GL
       }
     else
       {
-         r = g = b = a = 255;
+         a = (dc->col.col >> 24) & 0xff;
+         r = (dc->col.col >> 16) & 0xff;
+         g = (dc->col.col >> 8 ) & 0xff;
+         b = (dc->col.col      ) & 0xff;
       }
  
 -   glFlush();
 +   glsym_glFlush();
  
     c = gc->dc->clip.use;
     cx = gc->dc->clip.x; cy = gc->dc->clip.y;

diff --cc src/modules/engines/gl_x11/evas_engine.c
Simple merge

diff --cc src/modules/loaders/gif/evas_image_load_gif.c
Simple merge