[gtk+/quartz-integration: 22/22] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 22/22] Merge branch 'master' into quartz-integration
- Date: Wed, 9 Feb 2011 07:30:12 +0000 (UTC)
commit c05f41540498886190713f7d10070df22d38b256
Merge: 3663612 adef256
Author: John Ralls <jralls ceridwen us>
Date: Tue Feb 8 23:21:13 2011 -0800
Merge branch 'master' into quartz-integration
INSTALL.in | 6 +-
NEWS | 29 +
README.in | 14 +
configure.ac | 8 +-
docs/reference/gdk/Makefile.am | 3 +-
docs/reference/gdk/gdk-docs.sgml | 15 +-
docs/reference/gdk/multihead.sgml | 128 ----
docs/reference/gtk/building.sgml | 21 +-
docs/reference/gtk/gtk-docs.sgml | 10 +-
docs/reference/gtk/gtk-query-immodules-3.0.xml | 15 +-
docs/reference/gtk/gtk-update-icon-cache.xml | 32 +-
docs/reference/gtk/gtk3-sections.txt | 5 +
docs/reference/gtk/question_index.sgml | 10 +-
docs/reference/gtk/running.sgml | 22 +-
gdk/Makefile.am | 2 +-
gdk/gdk.c | 26 +-
gdk/gdkdevice.c | 4 +-
gdk/gdkdevice.h | 2 +-
gdk/gdkdisplay.c | 36 +-
gdk/gdkdisplaymanager.c | 43 ++-
gdk/gdkscreen.c | 17 +-
gdk/gdkwindow.c | 2 +-
gtk/Makefile.am | 3 +-
gtk/gtk.symbols | 8 -
gtk/gtkappchooserbutton.c | 7 +-
gtk/gtkborder.h | 12 +-
gtk/gtkcellarea.c | 4 +-
gtk/gtkcellareabox.c | 4 +-
gtk/gtkcellareabox.h | 6 +-
gtk/gtkcellareaboxcontext.c | 62 +-
gtk/gtkcellareaboxcontextprivate.h | 4 +-
gtk/gtkcomboboxtext.c | 9 +-
gtk/gtkdnd-quartz.c | 2 +-
gtk/gtkdnd.c | 12 +-
gtk/gtkicontheme.c | 18 +-
gtk/gtkimage.c | 2 +-
gtk/gtkimage.h | 43 --
gtk/gtkimageprivate.h | 82 +++
gtk/gtkmain.c | 29 +-
gtk/gtkmainprivate.h | 2 +
gtk/gtkmenu.c | 13 +-
gtk/gtkmenuitem.c | 33 +-
gtk/gtkmenuitem.h | 6 +-
gtk/gtkmodifierstyle.c | 42 +-
gtk/gtkmodifierstyle.h | 36 +-
gtk/gtkmodules.c | 27 +-
gtk/gtkprintbackend.c | 2 +-
gtk/gtkprintjob.c | 5 +-
gtk/gtkstyle.c | 10 +
gtk/gtkwidget.c | 52 +-
po/es.po | 757 ++++++++++++++----------
51 files changed, 996 insertions(+), 746 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]