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



commit f2332f6a2c4f8b89db153fbe1029d8f500ea2b92
Merge: db1202e ec6f6c4
Author: John Ralls <jralls ceridwen us>
Date:   Mon Mar 21 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                                     |   26 +-
 docs/reference/gdk/gdk3-sections.txt             |    1 +
 docs/reference/gtk/gtk3-sections.txt             |    2 +
 gdk/gdk.symbols                                  |    1 +
 gdk/gdkdisplay.c                                 |    1 +
 gdk/gdkwindow.c                                  |    2 +
 gdk/x11/gdkwindow-x11.c                          |   39 +
 gdk/x11/gdkx11window.h                           |    2 +
 gtk/gtk.symbols                                  |    2 +
 gtk/gtkaboutdialog.c                             |    2 +
 gtk/gtkcssprovider.c                             |    1 +
 gtk/gtkentry.c                                   |  156 +-
 gtk/gtkentry.h                                   |    4 +
 gtk/gtkexpander.c                                |  111 +-
 gtk/gtkexpander.h                                |   60 +-
 gtk/gtkfilechooserdefault.c                      |    1 -
 gtk/gtkthemingengine.c                           |    8 +-
 gtk/gtktreeview.c                                |    2 +
 gtk/gtkwindow.c                                  |   47 +
 modules/other/gail/gailentry.c                   |   75 +-
 modules/printbackends/cups/gtkprintbackendcups.c |   36 +-
 po-properties/as.po                              | 5044 ++++++++++++----------
 po/as.po                                         | 2211 ++++++-----
 po/lt.po                                         | 1914 +++++----
 24 files changed, 5579 insertions(+), 4169 deletions(-)
---



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