[gnome-keyring: 3/3] Merge branch '624570-gtk3-option'

From: Stefan Walter <stefw src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-keyring: 3/3] Merge branch '624570-gtk3-option'
Date: Wed, 1 Sep 2010 03:20:04 +0000 (UTC)

commit 995bf0069468ad82f228d6737e17796ffbaf6028
Merge: d9ef944 2b308e5
Author: Stef Walter <stef memberwebs com>
Date:   Wed Sep 1 03:19:31 2010 +0000

    Merge branch '624570-gtk3-option'

 configure.in                   |   34 ++++++++++++++++++++++++++++++++--
 docs/reference/gcr/Makefile.am |    5 ++---
 gcr/.gitignore                 |    1 +
 gcr/Makefile.am                |   14 +++++++-------
 gcr/gcr.pc.in                  |    8 ++++----
 gcr/tests/Makefile.am          |    2 +-
 tool/.gitignore                |    1 +
 tool/Makefile.am               |   16 +++++++++++-----
 ui/.gitignore                  |    1 +
 ui/Makefile.am                 |   18 ++++++++++++------
 10 files changed, 72 insertions(+), 28 deletions(-)
---

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