[gnome-keyring: 4/4] Merge branch 'gnome-3-0'

From: Stefan Walter <stefw src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-keyring: 4/4] Merge branch 'gnome-3-0'
Date: Mon, 9 May 2011 09:05:23 +0000 (UTC)

commit 4b36d7578819ade6986f7c85cbbeb20265d6bce8
Merge: 89b8c29 aebb7bf
Author: Stef Walter <stefw collabora co uk>
Date:   Mon May 9 11:05:05 2011 +0200

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	gck/Makefile.am
    	gcr/Makefile.am

 configure.ac    |    2 +-
 gck/Makefile.am |    2 +-
 gcr/Makefile.am |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
---

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