[gtk+/native-layout-incubator-2: 34/34] Merge branch 'master' into native-layout-incubator-2



commit cb662e8aac48a355ab6d9ffa325733785ef0734e
Merge: 41915fc 6917d46
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Aug 17 01:39:38 2010 -0400

    Merge branch 'master' into native-layout-incubator-2

 Makefile.decl                        |   16 +-
 NEWS                                 |  100 ++++++
 demos/gtk-demo/drawingarea.c         |   42 ++--
 docs/reference/gdk/gdk3-sections.txt |    9 +-
 docs/reference/gtk/gtk-docs.sgml     |    1 -
 docs/reference/gtk/gtk3-sections.txt |   25 ++-
 gdk/gdk.symbols                      |   11 +-
 gdk/gdkdisplay.c                     |    4 +-
 gdk/gdkinternals.h                   |    1 +
 gdk/gdkwindow.c                      |  235 ++++++++------
 gdk/gdkwindow.h                      |   13 +-
 gdk/quartz/gdkwindow-quartz.c        |    4 +-
 gtk/gtk.symbols                      |    1 +
 gtk/gtkaboutdialog.c                 |   10 +-
 gtk/gtkbbox.c                        |  268 +++++++----------
 gtk/gtkbbox.h                        |   10 +-
 gtk/gtkcalendar.c                    |  572 +++++++++++++++++++---------------
 gtk/gtkcalendar.h                    |   32 +--
 gtk/gtkenums.h                       |    3 +-
 gtk/gtkhbbox.c                       |    7 -
 gtk/gtkrange.c                       |    2 +-
 gtk/gtkrange.h                       |    2 +-
 gtk/gtktextdisplay.c                 |   21 +-
 gtk/gtktexttagtable.c                |   88 ++++--
 gtk/gtktexttagtable.h                |    7 +-
 gtk/gtktoolbar.c                     |  446 +++++++++++++++------------
 gtk/gtktoolbar.h                     |   19 +-
 gtk/gtkvbbox.c                       |    9 -
 po-properties/es.po                  |  364 ++++++++++++----------
 po/LINGUAS                           |    1 -
 po/es.po                             |  160 +++++-----
 po/gl.po                             |  166 ++++++-----
 po/sl.po                             |  170 ++++++-----
 tests/stresstest-toolbar.c           |   30 ++-
 tests/testcalendar.c                 |   54 +---
 tests/testtoolbar.c                  |    2 +-
 tests/testwindows.c                  |    3 -
 37 files changed, 1566 insertions(+), 1342 deletions(-)
---



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