[gtk+/quartz-integration: 31/31] Merge branch 'master' into quartz-integration



commit 08c16acfdc663a54ddb93a00aac97bb9e5ff1a36
Merge: e58026d 5bd32b8
Author: John Ralls <jralls ceridwen us>
Date:   Mon Mar 28 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/Makefile.am       |    2 +-
 docs/reference/gtk/drawing-model.xml |  199 +-
 docs/reference/gtk/gtk3-sections.txt |    1 +
 gtk/gtk.symbols                      |    1 +
 gtk/gtkappchooserdialog.c            |    8 +
 gtk/gtkcombobox.c                    |    2 -
 gtk/gtkdnd.c                         |   12 +-
 gtk/gtkfilechooserdefault.c          |    9 +-
 gtk/gtkfilesystem.c                  |    3 +
 gtk/gtkfilesystemmodel.c             |    4 +
 gtk/gtknotebook.c                    |   14 +-
 gtk/gtkrecentmanager.c               |    6 +
 gtk/gtksearchenginetracker.c         |   12 +
 gtk/gtksizerequest.c                 |    2 +
 gtk/gtkstock.h                       |    2 +-
 gtk/gtkwidget.c                      |  155 +-
 gtk/gtkwidgetpath.c                  |  122 +-
 gtk/gtkwidgetpath.h                  |    1 +
 po-properties/fr.po                  | 7033 +++++++++++++++++-----------------
 po-properties/ru.po                  | 5061 ++++++++++++------------
 po-properties/sv.po                  |  610 ++--
 po/ug.po                             |  264 +-
 22 files changed, 6857 insertions(+), 6666 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]