projects / clutter-gtk / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f28e3cd 86f41ea)
Merge branch '1.0-integration'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Fri, 5 Jun 2009 13:17:16 +0000 (14:17 +0100)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Fri, 5 Jun 2009 13:17:16 +0000 (14:17 +0100)
* 1.0-integration:
  [gtk-clutter-test] Update for the clutter timeline changes
  [examples] Use different sized stages
  Updates for 1.0 API changes in Clutter
  Update for Clutter 1.0 API changes

Conflicts:
examples/gtk-clutter-multistage.c

1  2 
clutter-gtk/gtk-clutter-embed.c patch | diff1 | diff2 | blob | history

diff --cc clutter-gtk/gtk-clutter-embed.c
Simple merge
Unnamed repository; edit this file to name it for gitweb.