[gtk+/quartz-integration: 512/851] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 512/851] Merge branch 'master' into quartz-integration
- Date: Fri, 24 Dec 2010 21:26:36 +0000 (UTC)
commit 5d709b90d5953197e89c9420ceb6870431fa4ff5
Merge: bb8abc4 3573179
Author: John Ralls <jralls ceridwen us>
Date: Sat Dec 18 23:21:07 2010 -0800
Merge branch 'master' into quartz-integration
docs/reference/gtk/gtk3-sections.txt | 20 +
gdk/gdk.symbols | 4 +
gtk/gtk.symbols | 20 +
gtk/gtkcombobox.c | 2 +-
gtk/gtkplug.c | 15 +-
gtk/gtkprintjob.c | 386 +++++++-
gtk/gtkprintjob.h | 50 +-
gtk/gtkprintoperation-unix.c | 22 +-
gtk/gtksocket-x11.c | 125 ++--
gtk/gtksocket.c | 239 +++--
gtk/gtksocket.h | 20 +-
gtk/gtksocketprivate.h | 59 +-
gtk/gtktreeselection.c | 313 ++++--
gtk/gtktreeselection.h | 11 +-
gtk/gtktreeview.c | 12 +-
modules/other/gail/gail.c | 2 +-
modules/other/gail/gailtreeview.c | 2 +-
modules/printbackends/cups/gtkprintbackendcups.c | 39 +-
modules/printbackends/file/gtkprintbackendfile.c | 40 +-
modules/printbackends/lpr/gtkprintbackendlpr.c | 40 +-
po-properties/he.po | 1253 +++++++++++-----------
po/he.po | 392 ++++----
22 files changed, 1801 insertions(+), 1265 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]