[folks: 7/7] Merge branch '0.7.4-release'

From: Jeremy Whiting <jpwhiting src gnome org>
To: commits-list gnome org
Cc:
Subject: [folks: 7/7] Merge branch '0.7.4-release'
Date: Tue, 11 Sep 2012 21:28:34 +0000 (UTC)

commit 0bec522d26f179be0c5e5d5838b7d9e9b74b397b
Merge: a7824ba f4e9425
Author: Jeremy Whiting <jpwhiting kde org>
Date:   Tue Sep 11 15:25:56 2012 -0600

    Merge branch '0.7.4-release'

 backends/telepathy/lib/Makefile.am      |    1 -
 backends/telepathy/lib/tpf-persona.vala |   14 ++++----------
 configure.ac                            |    6 +++---
 folks/individual.vala                   |    2 +-
 folks/persona.vala                      |    2 +-
 folks/utils.vala                        |    2 +-
 po/POTFILES.in                          |    1 +
 po/POTFILES.skip                        |    1 +
 8 files changed, 12 insertions(+), 17 deletions(-)
---

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