Merge branch 'master' of ssh://165.213.149.219:29418/slp/pkgs/e/evas

diff --cc src/lib/Evas.h
Simple merge

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

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