Emmanuele Bassi 5f15a620a1 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		2010-08-20 15:24:42 +01:00
..
examples	Merge remote branch 'elliot/cookbook-textures-crossfade'	2010-08-20 15:24:42 +01:00
images	cookbook: Added recipe for handling pointer events on an actor	2010-08-20 13:56:17 +01:00
videos	cookbook: Added video of two texture cross-fade	2010-08-18 11:41:32 +01:00
actors.xml	cookbook: Added recipe for non-rectangular actor	2010-08-10 11:08:05 +01:00
animations.xml	cookbook: Added recipe for animated rotation of an actor	2010-07-28 11:43:26 +01:00
clutter-cookbook.xml.in	cookbook: Added layouts section and introduction	2010-08-09 11:43:33 +01:00
events.xml	cookbook: Added recipe for handling pointer events on an actor	2010-08-20 13:56:17 +01:00
introduction.xml	cookbook: Split the cookbook chapters	2010-07-01 12:19:17 +01:00
layouts.xml	cookbook: Added layout introduction and "stacking actors" recipe	2010-08-09 16:25:48 +01:00
Makefile.am	Merge remote branch 'elliot/cookbook-textures-crossfade'	2010-08-20 15:24:42 +01:00
recipe-template.xml	cookbook: Split the cookbook chapters	2010-07-01 12:19:17 +01:00
text.xml	cookbook: Close a tag, making xsltproc happier	2010-08-06 15:43:15 +01:00
textures.xml	cookbook: Use GdkPixbuf instead of getting data from a texture	2010-08-18 16:02:51 +01:00
version.xml.in	Add the Clutter Cookbook to the build	2009-11-30 21:31:19 +00:00