Merge branch 'no-layout-flag' into ebassi-next
authorEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 9 Dec 2009 23:32:41 +0000 (23:32 +0000)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Wed, 9 Dec 2009 23:32:41 +0000 (23:32 +0000)
commit60a6bff3136c21c5ff6d4c5bb6614716853620f0
tree54c8ddede5fb731385a17106e2681af94aa360bb
parentdc47550bc8eabc2c6e6e99364c1cb536a9adc973
parentc4f27b1556b65464fd1f53749d32db9adab97942
Merge branch 'no-layout-flag' into ebassi-next

* no-layout-flag:
  actor: Add a NO_LAYOUT flag for actors
clutter/clutter-actor.c