[ease: 9/9] Merge branch 'transitions'

From: Nate Stedman <natesm src gnome org>
To: commits-list gnome org
Cc:
Subject: [ease: 9/9] Merge branch 'transitions'
Date: Sun, 30 May 2010 23:28:47 +0000 (UTC)

commit 19d7bd245172b41ab87ba44cb233b05f0ca8c36d
Merge: 886cac9 0447819
Author: Nate Stedman <natesm gmail com>
Date:   Sun May 30 19:26:44 2010 -0400

    Merge branch 'transitions'

 Examples/Example.ease/Document.json     |   40 ++--
 Examples/Transitions.ease/Document.json |  254 +++++++++++-----------
 src/JSONParser.vala                     |   14 +-
 src/Slide.vala                          |    4 +-
 src/SlideActor.vala                     |  114 +++++-----
 src/TransitionPane.vala                 |   46 +++--
 src/Transitions.vala                    |  347 +++++++++++++++++++++++++------
 7 files changed, 526 insertions(+), 293 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]