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

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+/quartz-integration: 7/7] Merge branch 'master' into quartz-integration
Date: Sat, 26 Feb 2011 07:30:02 +0000 (UTC)

commit 4119fdf4cca81ea903070151ba003483dfdc8918
Merge: e5c5fde 2e192d0
Author: John Ralls <jralls ceridwen us>
Date:   Fri Feb 25 23:21:08 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/gdkevents.c       |    2 +
 gtk/Makefile.am       |    8 +++++++
 gtk/gtkiconview.c     |   18 +++++++++++-----
 gtk/gtkswitch.c       |   51 ++++++++++++++++++++++++++++++++++--------------
 gtk/gtkswitch.h       |    3 +-
 gtk/gtktrayicon-x11.c |    2 +
 6 files changed, 62 insertions(+), 22 deletions(-)
---

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