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)
commit2456362cdb08bc4580ddef5e4748c2439a201c7e
tree5b505869ecbb4e698c8ff2fadb2e05b84e91ea22
parent0da2fa2f79733bf8dcfe32c2e744ea22a84beff7
parentb40c37e364f118223e5b9dae9c7890cd6b2dc7bf
Merge branch 'zoomable'

* 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
clutter-gtk/Makefile.am
clutter-gtk/gtk-clutter-viewport.c