[gtk+/native-layout: 40/40] Merge branch 'master' into native-layout



commit c659d1a505dbf141aefa266fb0e97c6dac218cee
Merge: e08d04b... 182108c...
Author: Johannes Schmid <jhs gnome org>
Date:   Mon Dec 14 15:36:22 2009 +0100

    Merge branch 'master' into native-layout

 docs/reference/gtk/tmpl/gtkbuildable.sgml |    6 +-
 gdk/directfb/gdkscreen-directfb.c         |    8 +
 gdk/gdk.symbols                           |    3 +-
 gdk/gdkoffscreenwindow.c                  |   49 +-
 gdk/gdkscreen.h                           |    1 +
 gdk/gdkwindow.c                           |   99 +-
 gdk/quartz/gdkscreen-quartz.c             |   10 +-
 gdk/win32/gdkscreen-win32.c               |    8 +
 gdk/x11/gdkscreen-x11.c                   |   41 +-
 gdk/x11/gdkscreen-x11.h                   |    1 +
 gdk/x11/gdkwindow-x11.c                   |    4 +-
 gtk/gtk.symbols                           |    1 +
 gtk/gtkaccessible.h                       |    2 +-
 gtk/gtkassistant.c                        |   15 +-
 gtk/gtkbutton.c                           |   13 +-
 gtk/gtkcellrenderercombo.c                |    6 +-
 gtk/gtkcellrendererspin.c                 |    4 +-
 gtk/gtkcellrenderertext.c                 |   14 +-
 gtk/gtkcombobox.c                         |   21 +-
 gtk/gtkcombobox.h                         |    2 -
 gtk/gtkiconview.c                         |    2 +-
 gtk/gtkprintbackend.c                     |    7 +-
 gtk/gtkprintcontext.c                     |   64 +
 gtk/gtkprintcontext.h                     |    5 +
 gtk/gtkprinter.c                          |    2 +-
 gtk/gtkprintoperation-private.h           |    5 +
 gtk/gtkprintoperation-unix.c              |   15 +
 gtk/gtkprintoperation-win32.c             |   23 +-
 gtk/gtkprintsettings.c                    |   23 +-
 gtk/gtktextview.c                         |    8 +-
 gtk/gtktoolitem.c                         |    2 +-
 gtk/gtktreemodelfilter.h                  |    2 +-
 gtk/gtktreestore.c                        |    2 -
 gtk/gtkwidget.c                           |    7 +-
 gtk/tests/builder.c                       |   12 +-
 gtk/tests/treeview.c                      |    2 +-
 po-properties/he.po                       | 3500 +++++++++++-----------
 po-properties/sl.po                       | 4744 ++++++++++++++---------------
 po/ar.po                                  | 2214 +++++++-------
 po/es.po                                  | 2227 +++++++-------
 po/et.po                                  | 1135 +-------
 po/he.po                                  | 2267 +++++++-------
 po/nb.po                                  | 2204 +++++++-------
 po/nds.po                                 |  484 ++--
 po/sl.po                                  | 2843 ++++++++---------
 po/te.po                                  |    2 +-
 tests/testassistant.c                     |   14 +-
 tests/testxinerama.c                      |   48 +-
 48 files changed, 10568 insertions(+), 11603 deletions(-)
---



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