[gtk+/quartz-integration: 4/4] Merge branch 'master' into quartz-integration

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+/quartz-integration: 4/4] Merge branch 'master' into quartz-integration
Date: Fri, 1 Jul 2011 06:36:14 +0000 (UTC)

commit 4028404654b81a3669324761377eca049fb44f44
Merge: dbcae2d c244976
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jun 30 23:21:25 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt |    5 +
 gdk/x11/gdkkeys-x11.c                |    2 +
 gtk/gtkbox.c                         |    7 +-
 gtk/gtkstylecontext.c                |  202 ++++++++--------------------------
 gtk/gtkstylecontext.h                |  150 +++++++++++++++++++++----
 5 files changed, 181 insertions(+), 185 deletions(-)
---

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