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

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

diff --cc src/lib/edje_entry.c
index de7b8aa,a30e609..8030c22
--- 1/src/lib/edje_entry.c
--- 2/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@@ -68,10 -68,8 +68,9 @@@ struct _Entr
     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