[gnome-keyring: 4/6] Merge branch 'gnome-3-4'
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring: 4/6] Merge branch 'gnome-3-4'
- Date: Tue, 19 Jun 2012 11:07:02 +0000 (UTC)
commit 6f97ecf2773281fa2b4d38301f27d27bf6e26d0c
Merge: 425394b c53bb44
Author: Stef Walter <stefw gnome org>
Date: Tue Jun 19 12:36:37 2012 +0200
Merge branch 'gnome-3-4'
pkcs11/gkm/gkm-certificate.c | 6 ++++--
pkcs11/gnome2-store/gkm-gnome2-private-key.c | 5 +++++
pkcs11/gnome2-store/gkm-gnome2-storage.c | 9 +++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]