[gtk+/quartz-integration: 23/23] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 23/23] Merge branch 'master' into quartz-integration
- Date: Fri, 28 Jan 2011 07:28:48 +0000 (UTC)
commit f915fe7dd0b447ab4bfe06dd17f81bc1e2317b76
Merge: c731e2c 5a5854f
Author: John Ralls <jralls ceridwen us>
Date: Thu Jan 27 23:21:08 2011 -0800
Merge branch 'master' into quartz-integration
docs/reference/gtk/gtk-docs.sgml | 8 +-
docs/reference/gtk/gtk3-sections.txt | 3 +-
gtk/gtk.symbols | 3 +-
gtk/gtkassistant.c | 4 +-
gtk/gtkbuilder.c | 9 +-
gtk/gtkcellarea.c | 77 +-
gtk/gtkcellarea.h | 4 -
gtk/gtkcellrenderer.c | 57 +-
gtk/gtkcellrenderer.h | 4 +
gtk/gtkcellrendereraccel.c | 15 +-
gtk/gtkcellrendererpixbuf.c | 74 +-
gtk/gtkcellrendererprogress.c | 88 +-
gtk/gtkcellrenderertext.c | 55 +-
gtk/gtkcellrenderertoggle.c | 62 +-
gtk/gtkcellview.c | 1 -
gtk/gtkcssprovider.c | 75 +-
gtk/gtkfilechooserdefault.c | 103 +-
gtk/gtkfilefilter.c | 194 ++-
gtk/gtkiconview.c | 208 +-
gtk/gtkrbtree.h | 4 -
gtk/gtksizerequest.c | 9 +-
gtk/gtktreeprivate.h | 2 +
gtk/gtktreeview.c | 691 +++---
gtk/gtktreeviewcolumn.c | 4 +-
gtk/gtkwidget.c | 9 +
po-properties/es.po | 349 ++--
po-properties/nb.po | 3858 +++++++++++++++++-----------------
27 files changed, 3058 insertions(+), 2912 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]