raster pushed a commit to branch efl-1.17. http://git.enlightenment.org/core/efl.git/commit/?id=4cb0222fec4d809cb26235c04af7717c3a7393b4
commit 4cb0222fec4d809cb26235c04af7717c3a7393b4 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Jul 7 16:35:02 2016 +0900 git merge conflict --- src/lib/eina/eina_thread.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/lib/eina/eina_thread.c b/src/lib/eina/eina_thread.c index 83e752a..429087e 100644 --- a/src/lib/eina/eina_thread.c +++ b/src/lib/eina/eina_thread.c @@ -32,14 +32,9 @@ #include "eina_debug.h" -<<<<<<< HEAD -# include <pthread.h> -# include <errno.h> -======= #include <pthread.h> #include <errno.h> #include <signal.h> ->>>>>>> aeeda1f... efl - threads and signals - make efl work on "insane" os's with signals #ifdef EINA_HAVE_PTHREAD_AFFINITY #ifndef __linux__ --
