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)
commitb6bd8be6cb0fabf2ddf3eedadce68c8d3a60c3d9
treea452a6f83b50cd69e28a1a92092cbc1e22b06089
parent7b53aa7510adc60d3287740772ec97117ce78ab9
parentc7e8ddb7a60dd76d5f62027383693575f30e2473
Merge branch 'internal-flag' into ebassi-next

* internal-flag:
  conform: Add test unit for the destruction of Containers
  actor: Add internal child flag
  Clean up whitespace, indentation and comments
clutter/clutter-actor.c
clutter/clutter-actor.h
clutter/clutter-main.c
clutter/clutter-private.h
doc/reference/clutter/clutter-sections.txt