Merge branch 'internal-flag' into ebassi-next
authorEmmanuele Bassi <ebassi@linux.intel.com>
Sun, 20 Dec 2009 17:33:51 +0000 (17:33 +0000)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Sun, 20 Dec 2009 17:33:51 +0000 (17:33 +0000)
* internal-flag:
  conform: Add test unit for the destruction of Containers
  actor: Add internal child flag
  Clean up whitespace, indentation and comments

1  2 
clutter/clutter-actor.c
clutter/clutter-actor.h
clutter/clutter-main.c
clutter/clutter-private.h
doc/reference/clutter/clutter-sections.txt

Simple merge
Simple merge
Simple merge
Simple merge