[gtk+/quartz-integration: 9/15] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 9/15] Merge branch 'master' into quartz-integration
- Date: Sat, 16 Jul 2011 12:35:19 +0000 (UTC)
commit 58e1f46ced755b6ddf26f94370d6b94dd1d305dd
Merge: bb2e8a0 3cc22ee
Author: John Ralls <jralls ceridwen us>
Date: Fri Jul 15 08:17:19 2011 -0700
Merge branch 'master' into quartz-integration
Conflicts:
gdk/quartz/gdkselection-quartz.c
gtk/gtkdnd-quartz.c
docs/reference/gtk/gtk3-sections.txt | 1 -
gdk/quartz/gdkselection-quartz.c | 7 +---
gtk/Makefile.am | 1 -
gtk/gtk.symbols | 1 -
gtk/gtkaccessible.c | 67 +++++++++++-----------------------
gtk/gtkaccessible.h | 23 +++++-------
gtk/gtkaccessibleprivate.h | 31 ----------------
gtk/gtkassistant.c | 1 -
gtk/gtkdnd-quartz.c | 6 +++-
gtk/gtkiconview.c | 1 -
gtk/gtkseparatormenuitem.c | 1 -
gtk/gtkswitch.c | 1 -
gtk/gtkwidget.c | 23 ------------
gtk/gtkwidget.h | 1 -
14 files changed, 39 insertions(+), 126 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]