mutter/doc
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
..
common cookbook: Make the table of content have a depth of 2 2010-08-06 15:43:16 +01:00
cookbook Merge remote branch 'elliot/cookbook-textures-crossfade' 2010-08-20 15:24:42 +01:00
manual build: Distcheck fixes 2010-06-30 12:26:10 +01:00
reference click-action: Add a method to force a release 2010-08-19 12:10:43 +01:00
clutter-actor-invariants.txt clutter-texture: Remove confusing comments about realization 2010-04-19 15:34:43 +01:00
CODING_STYLE docs: Move documentation under doc/ 2009-12-01 10:16:25 +00:00
HACKING docs: Note the P_() macro in the HACKING file 2010-07-15 17:31:10 +01:00
HACKING.backends docs: Update the HACKING.backends file 2010-03-04 18:07:04 +00:00
Makefile.am docs: Disable manual 2010-06-30 11:56:13 +01:00
RELEASING docs: Move RELEASING under docs/ 2009-12-09 18:10:52 +00:00