[gtk+/quartz-integration: 19/19] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 19/19] Merge branch 'master' into quartz-integration
- Date: Mon, 10 Jan 2011 07:29:15 +0000 (UTC)
commit 19a7f68327c73109c5b208392e086d0e82eaaf89
Merge: e084d4f 5c3b49a
Author: John Ralls <jralls ceridwen us>
Date: Sun Jan 9 23:21:10 2011 -0800
Merge branch 'master' into quartz-integration
docs/reference/gtk/gtk3-sections.txt | 1 +
gtk/gtk.symbols | 1 +
gtk/gtkbutton.c | 21 +-
gtk/gtkbutton.h | 5 +-
gtk/gtkcolorbutton.c | 8 +-
gtk/gtkcolorsel.c | 8 +-
gtk/gtkcssprovider.c | 8 +
gtk/gtkfontsel.c | 18 +-
gtk/gtkhsv.c | 55 +-
gtk/gtkimage.c | 87 ++--
gtk/gtklayout.c | 16 +-
gtk/gtkprintunixdialog.c | 47 +-
gtk/gtkstylecontext.c | 72 ++-
gtk/gtkstylecontext.h | 3 +
gtk/gtktextdisplay.c | 28 +-
gtk/gtktogglebutton.c | 18 +-
gtk/gtkviewport.c | 96 ++--
gtk/gtkwidget.c | 14 +-
gtk/gtkwindow.c | 3 +-
modules/other/gail/gailtextview.c | 132 ++--
modules/other/gail/libgail-util/gailmisc.c | 113 ----
modules/other/gail/libgail-util/gailmisc.h | 4 -
modules/other/gail/libgail-util/gailutil.def | 1 -
po-properties/gl.po | 128 ++---
po/he.po | 901 ++++++++++++++------------
25 files changed, 884 insertions(+), 904 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]