[glib/gvariant: 6/27] Merge branch 'master' into gvariant
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/gvariant: 6/27] Merge branch 'master' into gvariant
- Date: Thu, 25 Feb 2010 08:09:30 +0000 (UTC)
commit e75aacd66beac5eb0d6405df00fb93cee85acb37
Merge: ac7e2d7 0ac2277
Author: Ryan Lortie <desrt desrt ca>
Date: Tue Feb 2 23:40:17 2010 -0500
Merge branch 'master' into gvariant
build/win32/vs9/Makefile.am | 1 +
build/win32/vs9/gio.vcproj | 4 ++--
glib/gvarianttypeinfo.c | 23 ++++++++++++++++-------
glib/gvarianttypeinfo.h | 21 ++++++++++++++++++++-
glib/tests/gvarianttype.c | 6 +++---
gobject/gvaluecollector.h | 10 +++++-----
6 files changed, 47 insertions(+), 18 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]