projects / clutter-gtk / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6a8f0badec6c15b9894c8e8bb128d7ea59ca9cc4
tree79beb137d3eca691202e73f339ee97a0f2718a08tree | snapshot
parentf28e3cd1d83833d373fba7f001ce03b0b9e06fe2commit | diff
parent86f41eaacd406902b5d772417738529c971d5935commit | diff
Merge branch '1.0-integration'

* 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
clutter-gtk/gtk-clutter-embed.c diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.