Emmanuele Bassi 7e33fe3175 Merge branch '1.0-integration' ... * 1.0-integration: (138 commits) [x11] Disable XInput by default [xinput] Invert the XI extension version check [cogl-primitives] Fix an unused variable warning when building GLES [clutter-stage-egl] Pass -1,-1 to clutter_stage_x11_fix_window_size Update the GLES backend to have the layer filters in the material [gles/cogl-shader] Add a missing semicolon [cogl] Move the texture filters to be a property of the material layer [text] Fix Pango unit to pixels conversion [actor] Force unrealization on destroy only for non-toplevels [x11] Rework map/unmap and resizing [xinput] Check for the XInput entry points [units] Validate units against the ParamSpec [actor] Add the ::allocation-changed signal [actor] Use flags to control allocations [units] Rework Units into logical distance value Remove a stray g_value_get_int() Remove usage of Units and macros [cogl-material] Allow setting a layer with an invalid texture handle [timeline] Remove the concept of frames from timelines [gles/cogl-shader] Fix parameter spec for cogl_shader_get_info_log ... Conflicts: configure.ac		2009-06-05 12:41:42 +01:00
..
clutter-backend-fruity.c	2008-06-26 Emmanuele Bassi <ebassi@openedhand.com>	2008-06-26 21:42:44 +00:00
clutter-backend-fruity.h
clutter-fruity.c	Enforce invariants on mapped, realized, visibility states	2009-04-24 15:27:19 +01:00
clutter-fruity.h
clutter-stage-fruity.c	Merge branch '1.0-integration'	2009-06-05 12:41:42 +01:00
clutter-stage-fruity.h
Makefile.am	2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>	2008-10-30 17:04:34 +00:00