[ease/buidler: 8/9] Merge branch 'master' into buidler

From: Stéphane Maniaci <maniacis src gnome org>
To: commits-list gnome org
Cc:
Subject: [ease/buidler: 8/9] Merge branch 'master' into buidler
Date: Wed, 14 Jul 2010 06:33:49 +0000 (UTC)

commit 1eec955b849e4833a692abbc87c9e1d0f8e62afd
Merge: 9a94eb4 2094452
Author: StÃ©phane Maniaci <stephane maniaci gmail com>
Date:   Wed Jul 14 01:25:40 2010 -0500

    Merge branch 'master' into buidler

 .gitignore                  |    4 +
 Makefile.am                 |    5 +-
 configure.ac                |    4 +-
 data/ease.desktop.in.in     |   11 ++
 po/POTFILES.in              |    3 -
 po/POTFILES.skip            |   16 --
 po/de.po                    |   26 ++--
 po/es.po                    |  121 +++++++---------
 po/fr.po                    |  110 +++++++--------
 po/pt_BR.po                 |  330 ++++++++++++++++++++++++++++---------------
 po/sl.po                    |  233 ++++++++++++++++++------------
 src/ease-json-parser.vala   |   12 +-
 src/ease-video-actor.vala   |  153 --------------------
 src/ease-video-element.vala |   83 -----------
 src/main.vala               |    2 -
 15 files changed, 499 insertions(+), 614 deletions(-)
---

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