[glib: 4/5] Merge remote branch 'gvdb/master'

From: Ryan Lortie <ryanl src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib: 4/5] Merge remote branch 'gvdb/master'
Date: Thu, 10 Jun 2010 17:55:11 +0000 (UTC)

commit 73007021796f33d7ccec4e5f2bb2b2f8660347f2
Merge: 45e604d 9a8cba9
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jun 10 13:35:25 2010 -0400

    Merge remote branch 'gvdb/master'

 gio/gvdb/gvdb-builder.c |   49 +------------
 gio/gvdb/gvdb-builder.h |    3 -
 gio/gvdb/gvdb-format.h  |    2 -
 gio/gvdb/gvdb-reader.c  |  179 ++++++++++++++++++++++++++++++++++-------------
 gio/gvdb/gvdb-reader.h  |   19 +++++-
 5 files changed, 150 insertions(+), 102 deletions(-)
---

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