[ease/gsoc2010: 35/39] Merge branch 'master' into gsoc2010
- From: Stéphane Maniaci <maniacis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease/gsoc2010: 35/39] Merge branch 'master' into gsoc2010
- Date: Thu, 20 May 2010 20:56:13 +0000 (UTC)
commit 226665f80d582c3807b8918d2c9f864acd2a1a8b
Merge: fefe810 154ebdf
Author: Stéphane Maniaci <stephane maniaci gmail com>
Date: Thu May 20 16:49:29 2010 +0200
Merge branch 'master' into gsoc2010
Examples/Example.ease/Document.xml | 20 +-
Examples/Transitions.ease/Document.xml | 17 +-
Makefile | 48 +--
ease.doap | 7 +
src/Actor.vala | 126 ++++
src/Document.vala | 286 ++++++++
src/EditorEmbed.vala | 493 ++++++++++++++
src/EditorWindow.vala | 341 ++++++++++
src/Element.vala | 406 ++++++++++++
src/ElementMap.vala | 106 +++
src/{libease/Theme.vala => ElementMapValue.vala} | 13 +-
src/{libease => }/Enums.vala | 24 +-
src/HTMLExporter.vala | 191 ++++++
src/Handle.vala | 185 ++++++
src/{libease => }/ImageActor.vala | 64 +-
src/Main.vala | 143 ++++
src/MainToolbar.vala | 83 +++
src/OpenDialog.vala | 61 ++
src/Player.vala | 188 ++++++
src/ScrollableEmbed.vala | 144 ++++
src/Slide.vala | 123 ++++
src/SlideActor.vala | 764 ++++++++++++++++++++++
src/SlideButton.vala | 128 ++++
src/SlideButtonPanel.vala | 62 ++
src/SlidePane.vala | 63 ++
src/TextActor.vala | 62 ++
src/{ease-player/main.c => Theme.vala} | 9 +-
src/TransitionPane.vala | 124 ++++
src/Transitions.vala | 140 ++++
src/UndoActions.vala | 72 ++
src/UndoController.vala | 57 ++
src/VideoActor.vala | 64 ++
src/WelcomeActor.vala | 86 +++
src/WelcomeWindow.vala | 277 ++++++++
src/ZoomSlider.vala | 113 ++++
src/ease/main.c | 24 -
src/libease/Actor.vala | 54 --
src/libease/Document.vala | 289 --------
src/libease/DraggableRectangle.vala | 131 ----
src/libease/EditorEmbed.vala | 163 -----
src/libease/EditorWindow.vala | 369 -----------
src/libease/Element.vala | 404 ------------
src/libease/ElementMap.vala | 108 ---
src/libease/ElementMapValue.vala | 27 -
src/libease/HTMLExporter.vala | 148 -----
src/libease/Main.vala | 190 ------
src/libease/MainToolbar.vala | 78 ---
src/libease/OpenDialog.vala | 64 --
src/libease/Player.vala | 189 ------
src/libease/ScrollableEmbed.vala | 145 ----
src/libease/Slide.vala | 126 ----
src/libease/SlideActor.vala | 572 ----------------
src/libease/SlideButton.vala | 130 ----
src/libease/SlideButtonPanel.vala | 64 --
src/libease/SlidePane.vala | 65 --
src/libease/TextActor.vala | 65 --
src/libease/TransitionPane.vala | 125 ----
src/libease/Transitions.vala | 139 ----
src/libease/VideoActor.vala | 66 --
src/libease/WelcomeActor.vala | 97 ---
src/libease/WelcomeWindow.vala | 294 ---------
vapi/clutter-1.0.vapi | 4 +-
62 files changed, 4990 insertions(+), 4230 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
