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



commit 04cba25414f0a688518d81b4b855f2cfbaa5d2d6
Merge: b8a70dc dd28e22
Author: John Ralls <jralls ceridwen us>
Date:   Wed Apr 13 23:21:24 2011 -0700

    Merge branch 'master' into quartz-integration

 NEWS                                              |  127 +++++
 README.in                                         |    2 +-
 configure.ac                                      |    2 +-
 docs/reference/gtk/gtk-docs.sgml                  |    4 +
 docs/reference/gtk/gtk3-sections.txt              |    4 +-
 docs/reference/gtk/tmpl/.gitignore                |   10 +
 docs/reference/gtk/tmpl/gtkcheckbutton.sgml       |   85 ----
 docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml     |  158 ------
 docs/reference/gtk/tmpl/gtkclipboard.sgml         |  499 -------------------
 docs/reference/gtk/tmpl/gtkcolorseldlg.sgml       |  117 -----
 docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml |  162 ------
 docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml |  174 -------
 docs/reference/gtk/tmpl/gtkfontsel.sgml           |  176 -------
 docs/reference/gtk/tmpl/gtkhandlebox.sgml         |  220 ---------
 docs/reference/gtk/tmpl/gtkiconfactory.sgml       |  542 ---------------------
 docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml  |  105 ----
 gdk/broadway/Makefile.am                          |    4 +
 gdk/wayland/Makefile.am                           |    1 -
 gtk/gtk.symbols                                   |    2 +
 gtk/gtkcheckbutton.c                              |   32 ++-
 gtk/gtkcheckmenuitem.c                            |   53 ++
 gtk/gtkclipboard.c                                |   90 +++-
 gtk/gtkclipboard.h                                |   82 +++
 gtk/gtkcolorseldialog.c                           |   33 ++
 gtk/gtkfilechooserbutton.c                        |   41 ++
 gtk/gtkfilechooserdialog.c                        |  128 +++++
 gtk/gtkfontsel.c                                  |   22 +
 gtk/gtkhandlebox.c                                |  109 ++++-
 gtk/gtkiconfactory.c                              |  101 ++++
 gtk/gtkmenubar.c                                  |    1 -
 gtk/gtkmenushell.c                                |    3 +-
 gtk/gtkmenushellprivate.h                         |    1 -
 gtk/gtktoggletoolbutton.c                         |   15 +
 33 files changed, 838 insertions(+), 2267 deletions(-)
---



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