Merge remote-tracking branch 'origin/upstream'

Conflicts:
	src/lib/ecore_x/xlib/ecore_x_events.c

diff --cc src/lib/ecore/ecore_thread.c
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_x.c
index a66caad,487aa03..0b4bc88
mode 100755,100644..100755
--- 1/src/lib/ecore_evas/ecore_evas_x.c
--- 2/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c
@@@ -1587,17 -1546,8 +1588,17 @@@ _ecore_evas_x_rotation_set(Ecore_Evas *
          einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
                                              (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_OPENGL_X11 */
       }
     else if (!strcmp(ee->driver, "software_x11"))
@@@ -1608,17 -1558,8 +1609,17 @@@
          einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
                                              (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */
       }
     else if (!strcmp(ee->driver,  "software_16_x11"))
@@@ -1629,17 -1570,8 +1630,17 @@@
          einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
                                              (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
       }
     else if (!strcmp(ee->driver,  "software_8_x11"))
@@@ -1650,24 -1582,10 +1651,24 @@@
          einfo = (Evas_Engine_Info_Software_8_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
                                              (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
 +        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_SOFTWARE_8_X11 */
       }
 +
 +#if _USE_WIN_ROT_EFFECT
 +  _ecore_evas_x_rotation_effect_setup();
 +  _ecore_evas_x_flush_pre(ee, NULL, NULL);
 +#endif /* end of _USE_WIN_ROT_EFFECT */
  }
  
  static void

diff --cc src/lib/ecore_x/Ecore_X.h
index 1ca8bf0,d489b80..664bb9f
mode 100755,100644..100755
--- 1/src/lib/ecore_x/Ecore_X.h
--- 2/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h

diff --cc src/lib/ecore_x/xlib/ecore_x_e.c
Simple merge

diff --cc src/lib/ecore_x/xlib/ecore_x_events.c
Simple merge