[glib/wip/gsettings-list: 10/11] Merge branch 'master' into wip/gsettings-list

From: Rodrigo Moya <rodrigo src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib/wip/gsettings-list: 10/11] Merge branch 'master' into wip/gsettings-list
Date: Tue, 23 Nov 2010 12:40:05 +0000 (UTC)

commit 36173a1eda4edd61f9790244b881dfd7de4a53ce
Merge: 8ddef1e a70ba9c
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Nov 22 17:30:42 2010 +0100

    Merge branch 'master' into wip/gsettings-list

 gio/gcharsetconverter.c |    2 +-
 gio/gfile.c             |    8 +-
 gio/gunixmounts.c       |    4 +
 glib/gstring.c          |   23 +-
 glib/gtimer.c           |    4 +-
 po/nb.po                | 1412 ++++++++++++++++++++++++++---------------------
 po/ug.po                |   72 ++--
 7 files changed, 841 insertions(+), 684 deletions(-)
---

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