[gtk+/quartz-integration: 25/25] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 25/25] Merge branch 'master' into quartz-integration
- Date: Thu, 13 Jan 2011 07:30:12 +0000 (UTC)
commit 65bd0f64d86b96223b17d5713d23b8259cc0fbb9
Merge: bfbffae 290c34b
Author: John Ralls <jralls ceridwen us>
Date: Wed Jan 12 23:21:11 2011 -0800
Merge branch 'master' into quartz-integration
NEWS | 24 +-
build/win32/vs9/gdk-win32.vcproj | 13 +-
build/win32/vs9/gdk.vcprojin | 9 +-
build/win32/vs9/gtk+.vsprops | 35 +-
build/win32/vs9/gtk-demo.vcproj | 8 +-
build/win32/vs9/gtk.vcprojin | 14 +-
configure.ac | 2 +-
docs/reference/gtk/gtk-builder-convert.xml | 11 +
docs/reference/gtk/tmpl/.gitignore | 2 +
docs/reference/gtk/tmpl/gtkenums.sgml | 458 -----
docs/reference/gtk/tmpl/gtktreemodel.sgml | 864 ---------
gdk/Makefile.am | 2 +-
gtk/gtk-builder-convert | 31 +-
gtk/gtkcellarea.c | 1 +
gtk/gtkcellareabox.c | 1 +
gtk/gtkcellrenderer.c | 4 +-
gtk/gtkcellview.c | 2 +
gtk/gtkcheckmenuitem.c | 45 +-
gtk/gtkcssprovider.c | 34 +-
gtk/gtkenums.h | 258 +++-
gtk/gtkgrid.c | 1 +
gtk/gtkimagemenuitem.c | 22 +-
gtk/gtkmenu.c | 91 +-
gtk/gtkmenuitem.c | 195 ++-
gtk/gtkmenushell.c | 9 +-
gtk/gtkorientable.c | 41 +-
gtk/gtkorientable.h | 3 +
gtk/gtkpapersize.c | 307 ++--
gtk/gtkprogressbar.c | 1 +
gtk/gtkseparator.c | 1 +
gtk/gtkstylecontext.c | 56 +
gtk/gtkswitch.c | 9 +
gtk/gtktearoffmenuitem.c | 88 +-
gtk/gtkthemingengine.c | 19 +-
gtk/gtktoolitemgroup.c | 99 +-
gtk/gtktoolpalette.c | 1 +
gtk/gtktreemodel.c | 1301 ++++++++------
gtk/gtktreemodel.h | 42 +-
gtk/tests/Makefile.am | 7 +-
gtk/tests/papersize.c | 128 ++
po/eu.po | 2790 ++++++++++------------------
41 files changed, 2934 insertions(+), 4095 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]