[ease/autotools: 6/7] Merge branch 'master' into autotools
- From: Stéphane Maniaci <maniacis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease/autotools: 6/7] Merge branch 'master' into autotools
- Date: Thu, 20 May 2010 21:44:22 +0000 (UTC)
commit 02c218b77a272bf7851c119e47df5d2706074c7f
Merge: 52d2a4d 8163f46
Author: Stéphane Maniaci <stephane maniaci gmail com>
Date: Thu May 20 22:58:48 2010 +0200
Merge branch 'master' into autotools
Examples/Example.ease/Document.xml | 2 +-
Examples/Transitions.ease/Document.xml | 108 +-
src/Document.vala | 15 +-
src/EditorEmbed.vala | 58 +-
src/Element.vala | 11 +-
src/Handle.vala | 2 +-
src/Main.vala | 1 +
src/Player.vala | 4 +-
src/SlideActor.vala | 102 +-
src/SlideButton.vala | 4 +-
src/TextActor.vala | 2 +-
src/TransitionPane.vala | 4 +-
src/WelcomeActor.vala | 11 +-
src/WelcomeWindow.vala | 17 +-
vapi/clutter-1.0.vapi | 5581 +++++---------------------------
15 files changed, 1026 insertions(+), 4896 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]