[gnome-keyring/dbus-api: 6/6] Merge branch 'master' into dbus-api

From: Stefan Walter <stefw src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gnome-keyring/dbus-api: 6/6] Merge branch 'master' into dbus-api
Date: Sat, 24 Oct 2009 01:45:49 +0000 (UTC)

commit aa9f1886654f897e8897b5e3f155e9224c5df464
Merge: ffdafbc... ea5fe62...
Author: Stef Walter <stef memberwebs com>
Date:   Sat Oct 24 01:45:31 2009 +0000

    Merge branch 'master' into dbus-api

 NEWS                          |   10 +-
 configure.in                  |    2 +-
 gp11/gp11-slot.c              |    1 +
 library/gnome-keyring-proto.c |    6 +-
 po/ru.po                      |  403 ++++++++++++++++++++---------------------
 5 files changed, 215 insertions(+), 207 deletions(-)
---

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