Merge branch 'zoomable'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Sat, 18 Jul 2009 23:48:35 +0000 (00:48 +0100)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Sat, 18 Jul 2009 23:48:35 +0000 (00:48 +0100)
* zoomable:
  [git ignore] Ignore backup and m4 files
  Update the Viewport example
  [viewport] Implement Zoomable
  [zoomable] Fix Introspection data generation
  [zoomable] Add Zoomable interface

Conflicts:
clutter-gtk/Makefile.am
clutter-gtk/gtk-clutter-viewport.c


No differences found