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

[John Ralls <jralls src gnome org>]

commit 0010ead729425ebe9b56164856c9eeefe214866d
Merge: bd86919 dd73be3
Author: John Ralls <jralls ceridwen us>
Date:   Sun Apr 17 23:21:24 2011 -0700

    Merge branch 'master' into quartz-integration

 build/win32/vs9/README.txt                      |   63 ++-
 build/win32/vs9/gtk+.vsprops                    |    2 +-
 build/win32/vs9/gtk.vcprojin                    |    8 +-
 docs/reference/gtk/tmpl/.gitignore              |   14 +
 docs/reference/gtk/tmpl/gtkdnd.sgml             |  424 ---------
 docs/reference/gtk/tmpl/gtkfontseldlg.sgml      |  129 ---
 docs/reference/gtk/tmpl/gtkhruler.sgml          |   54 --
 docs/reference/gtk/tmpl/gtklist.sgml            |  369 --------
 docs/reference/gtk/tmpl/gtklistitem.sgml        |  151 ----
 docs/reference/gtk/tmpl/gtkmenuitem.sgml        |  344 --------
 docs/reference/gtk/tmpl/gtkprintcontext.sgml    |  202 -----
 docs/reference/gtk/tmpl/gtkprintsettings.sgml   | 1040 -----------------------
 docs/reference/gtk/tmpl/gtkprintunixdialog.sgml |  317 -------
 docs/reference/gtk/tmpl/gtkradiomenuitem.sgml   |  149 ----
 docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml |  131 ---
 docs/reference/gtk/tmpl/gtksizegroup.sgml       |  194 -----
 docs/reference/gtk/tmpl/gtktextbuffer.sgml      |  974 ---------------------
 docs/reference/gtk/tmpl/gtktextmark.sgml        |  141 ---
 docs/reference/gtk/tmpl/gtktogglebutton.sgml    |  207 -----
 docs/reference/gtk/tmpl/gtktreemodelsort.sgml   |  222 -----
 docs/reference/gtk/tmpl/gtkwindowgroup.sgml     |   89 --
 gtk/gtkdnd.c                                    |  148 ++--
 gtk/gtkdnd.h                                    |   36 +-
 gtk/gtkentry.c                                  |    2 +-
 gtk/gtkenums.h                                  |   14 +
 gtk/gtkfontsel.c                                |   28 +-
 gtk/gtklabel.c                                  |   41 +-
 gtk/gtkmenuitem.c                               |   97 ++-
 gtk/gtkmenushell.c                              |    8 +-
 gtk/gtkmenushellprivate.h                       |    2 -
 gtk/gtkprintcontext.c                           |   77 ++
 gtk/gtkprinter.h                                |   22 +
 gtk/gtkprintsettings.c                          |   24 +-
 gtk/gtkprintsettings.h                          |   14 +
 gtk/gtkprintunixdialog.c                        |   71 ++
 gtk/gtkradiomenuitem.c                          |   49 ++
 gtk/gtkradiotoolbutton.c                        |   20 +
 gtk/gtksizegroup.c                              |   80 ++
 gtk/gtktextbuffer.c                             |   12 +
 gtk/gtktextbufferrichtext.h                     |   32 +
 gtk/gtktextmark.c                               |   37 +
 gtk/gtktextview.c                               |   17 +-
 gtk/gtktogglebutton.c                           |  102 +++-
 gtk/gtktreemodelsort.c                          |  107 +++
 gtk/gtkwindow.c                                 |   15 +
 45 files changed, 1043 insertions(+), 5236 deletions(-)
---