EFL migration revision 67705

Merge remote branch 'origin/upstream'

Conflicts:
	src/lib/edje_entry.c

diff --cc src/bin/edje_cc_handlers.c
Simple merge

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

diff --cc src/lib/edje_calc.c
Simple merge

diff --cc src/lib/edje_entry.c
index e7ba69c,420ce5b..de7b8aa
--- 1/src/lib/edje_entry.c
--- 2/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@@ -66,11 -34,8 +66,12 @@@ struct _Entr
     Eina_Bool select_allow : 1;
     Eina_Bool select_mod_start : 1;
     Eina_Bool select_mod_end : 1;
 +   Eina_Bool double_clicked : 1;
     Eina_Bool had_sel : 1;
+    Eina_Bool input_panel_enable : 1;
 +   Eina_Bool copy_paste_disabled : 1;
 +   int select_dragging_state;
 +   double space_key_time;
  
  #ifdef HAVE_ECORE_IMF
     Eina_Bool have_preedit : 1;

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

diff --cc src/lib/edje_util.c
Simple merge