Merge branch 'stage-use-alpha' into ebassi-next
authorEmmanuele Bassi <ebassi@linux.intel.com>
Sun, 20 Dec 2009 17:39:12 +0000 (17:39 +0000)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Sun, 20 Dec 2009 17:39:12 +0000 (17:39 +0000)
* stage-use-alpha:
  tests: Use accessor methods for :use-alpha
  stage: Add accessors for :use-alpha
  tests: Allow setting the stage opacity in test-paint-wrapper
  stage: Premultiply the stage color
  stage: Composite the opacity with the alpha channel
  glx: Always request an ARGB visual
  stage: Add :use-alpha property
  materials: Get the right blend function for alpha

1  2 
clutter/clutter-stage.h
doc/reference/clutter/clutter-sections.txt

Simple merge