diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-07-19 00:48:35 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-07-19 00:48:35 +0100 |
| commit | 2456362cdb08bc4580ddef5e4748c2439a201c7e (patch) | |
| tree | 5b505869ecbb4e698c8ff2fadb2e05b84e91ea22 /Makefile.am | |
| parent | 0da2fa2f79733bf8dcfe32c2e744ea22a84beff7 (diff) | |
| parent | b40c37e364f118223e5b9dae9c7890cd6b2dc7bf (diff) | |
| download | clutter-gtk-2456362cdb08bc4580ddef5e4748c2439a201c7e.tar.gz | |
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
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions