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



commit 228c98c91183751f710f9e522a58bf0f1dab5a7f
Merge: 4d2cc86 e02b100
Author: John Ralls <jralls ceridwen us>
Date:   Mon Dec 20 23:21:09 2010 -0800

    Merge branch 'master' into quartz-integration

 configure.ac                      |    2 +-
 docs/reference/gtk/running.sgml   |    9 -
 docs/widget_system.txt            |    2 +-
 gdk/gdkdevice.c                   |   25 +-
 gdk/gdkdisplay.c                  |    6 +-
 gdk/gdkwindow.c                   |   11 +-
 gtk/gtkaboutdialog.c              |   10 +-
 gtk/gtkappchooserdialog.c         |    6 +-
 gtk/gtkcalendar.c                 |   72 +++-
 gtk/gtkcellrendererspin.c         |    8 +-
 gtk/gtkcontainer.c                |   13 +-
 gtk/gtkcssprovider.c              |    8 +-
 gtk/gtkentry.c                    |    6 +-
 gtk/gtkhandlebox.c                |    2 +
 gtk/gtkprintoperation-unix.c      |    6 +-
 gtk/gtkstyle.c                    |   20 +-
 gtk/gtkstyleproperties.c          |    2 +
 gtk/gtktestutils.c                |    9 +-
 gtk/gtkwidget.c                   |  267 +++++++++++-
 gtk/gtkwindow.c                   |    5 +
 gtk/tests/stylecontext.c          |   31 ++
 modules/other/gail/gailtreeview.c |    2 +-
 po/et.po                          |   35 +-
 po/kk.po                          |  834 +++++++++++++++++++------------------
 24 files changed, 904 insertions(+), 487 deletions(-)
---



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