[ease/introspection: 17/17] Merge branch 'master' into introspection
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease/introspection: 17/17] Merge branch 'master' into introspection
- Date: Tue, 12 Oct 2010 18:45:34 +0000 (UTC)
commit 08e956d4ae2f34833978f37bf9930bde57fcb3b7
Merge: 6a7e21d 68c0e09
Author: Nate Stedman <natesm gmail com>
Date: Tue Oct 12 14:12:31 2010 -0400
Merge branch 'master' into introspection
Makefile.am | 4 +-
data/ui/inspector-element-pdf.ui | 14 +-
ease-core/ease-background.vala | 5 +-
ease-core/ease-dialogs.vala | 336 +++++++++++++++--
ease-core/ease-document.vala | 2 +-
ease-core/ease-pdf-actor.vala | 4 +-
ease-core/ease-pdf-element.vala | 71 +++-
ease-core/ease-shape-element.vala | 5 +-
ease-core/ease-slide.vala | 50 +--
ease-core/ease-theme.vala | 2 +
ease-core/ease-utilities.vala | 15 -
ease/ease-close-confirm-dialog.vala | 41 ++-
ease/ease-editor-embed.vala | 8 +-
ease/ease-editor-window.vala | 14 +-
ease/ease-scrollable-embed.vala | 10 +-
ease/ease-slide-actor.vala | 4 +-
ease/ease-welcome-actor.vala | 16 +-
ease/ease-welcome-window.vala | 4 +-
po/de.po | 93 +++---
po/es.po | 202 +++++++----
po/pt_BR.po | 696 ++++++++++++++++++++++-------------
21 files changed, 1082 insertions(+), 514 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]