From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 20 Aug 2010 14:24:42 +0000 (+0100)
Subject: Merge remote branch 'elliot/cookbook-textures-crossfade'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f15a620a107847e0b26bab6cdd1c9d27cd3a243;p=profile%2Fivi%2Fclutter.git

Merge remote branch 'elliot/cookbook-textures-crossfade'

* elliot/cookbook-textures-crossfade:
  cookbook: Use GdkPixbuf instead of getting data from a texture
  cookbook: Added a recipe for cross-fading between two images
  cookbook: Modified COGL example for consistency
  cookbook: Added video of two texture cross-fade
  cookbook: Removed unused constant
  cookbook: Renamed front/back to top/bottom in cross-fade example
  cookbook: Don't need to set keep-aspect-ratio for simple example
  cookbook: Modified ordering of statements in cross-fade example
  cookbook: Added a longer slideshow example
  cookbook: Made code examples more consistent
  cookbook: Added example code for texture cross-fading
  Post-release version bump to 1.3.13
  Release Clutter 1.3.12 (developers snapshot)

Conflicts:
	doc/cookbook/examples/Makefile.am
---

5f15a620a107847e0b26bab6cdd1c9d27cd3a243
diff --cc doc/cookbook/examples/Makefile.am
index 4f28f10,35aba90..530f4a9
--- a/doc/cookbook/examples/Makefile.am
+++ b/doc/cookbook/examples/Makefile.am
@@@ -11,10 -11,9 +11,13 @@@ noinst_PROGRAMS = 
  	layouts-stacking \
  	layouts-stacking-diff-sized-actors	\
  	events-mouse-scroll \
 +	events-pointer-motion	\
 +	events-pointer-motion-crossing	\
 +	events-pointer-motion-stacked	\
 +	events-pointer-motion-scribbler	\
+ 	textures-crossfade	\
+ 	textures-crossfade-cogl	\
+ 	textures-crossfade-slideshow	\
  	$(NULL)
  
  INCLUDES = \
@@@ -44,9 -43,8 +47,12 @@@ textures_sub_texture_SOURCE
  layouts_stacking_SOURCES                   = layouts-stacking.c
  layouts_stacking_diff_sized_actors_SOURCES = layouts-stacking-diff-sized-actors.c
  events_mouse_scroll_SOURCES                = events-mouse-scroll.c
 +events_pointer_motion_SOURCES              = events-pointer-motion.c
 +events_pointer_motion_crossing_SOURCES     = events-pointer-motion-crossing.c
 +events_pointer_motion_stacked_SOURCES      = events-pointer-motion-stacked.c
 +events_pointer_motion_scribbler_SOURCES    = events-pointer-motion-scribbler.c
+ textures_crossfade_SOURCES                 = textures-crossfade.c
+ textures_crossfade_cogl_SOURCES            = textures-crossfade-cogl.c
+ textures_crossfade_slideshow_SOURCES       = textures-crossfade-slideshow.c
  
  -include $(top_srcdir)/build/autotools/Makefile.am.gitignore