[gtk+/quartz-integration: 9/9] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 9/9] Merge branch 'master' into quartz-integration
- Date: Tue, 28 Dec 2010 07:29:40 +0000 (UTC)
commit d5e74f0d6602e32103acce26e9769ddf88c29244
Merge: b48c9a3 7032996
Author: John Ralls <jralls ceridwen us>
Date: Mon Dec 27 23:21:22 2010 -0800
Merge branch 'master' into quartz-integration
configure.ac | 8 +-
docs/reference/gdk/gdk3-sections.txt | 5 +-
gdk/gdk.symbols | 5 +-
gdk/gdkdevice.c | 93 ++++++++++++++++++++++++------
gdk/gdkdevice.h | 11 +++-
gdk/gdkdisplay.c | 106 +++++++---------------------------
gdk/gdkdisplay.h | 11 ----
gdk/gdkwindow.c | 5 +-
gtk/gtkcolorsel.c | 6 +-
gtk/gtkdnd.c | 8 +--
gtk/gtkhandlebox.c | 7 +-
gtk/gtkmenu.c | 3 +-
gtk/gtknotebook.c | 5 +-
gtk/gtktooltip.c | 4 +-
gtk/gtkwindow.c | 12 ++--
modules/other/gail/gailtoplevel.c | 38 ++++++-------
tests/testgtk.c | 37 +++++++-----
17 files changed, 173 insertions(+), 191 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]