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



commit c36711913c51ba4ca4c6e93498deae3d8ee7e3f0
Merge: 67ae2b9 8285c7f
Author: John Ralls <jralls ceridwen us>
Date:   Tue May 3 23:21:17 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                                  |    1 +
 docs/reference/gtk/gtk3-sections.txt          |    2 +
 gdk/gdkwindow.c                               |   86 +-
 gtk/gtk.symbols                               |    2 +
 gtk/gtkdnd.c                                  |   86 +-
 gtk/gtkdnd.h                                  |    6 +
 gtk/gtkimage.c                                |   14 +
 gtk/gtkimageprivate.h                         |    2 +-
 gtk/gtklabel.c                                |   12 +-
 tests/Makefile.am                             |    2 +
 tests/reftests/Makefile.am                    |   44 +
 tests/reftests/README                         |   31 +
 tests/reftests/entry-progress-coloring.css    |   22 +
 tests/reftests/entry-progress-coloring.ref.ui |  113 +
 tests/reftests/entry-progress-coloring.ui     |   76 +
 tests/reftests/grid-homogeneous.css           |    8 +
 tests/reftests/grid-homogeneous.ref.ui        |  134 +
 tests/reftests/grid-homogeneous.ui            |  186 +
 tests/reftests/gtk-reftest.c                  |  575 ++
 tests/reftests/label-sizing.css               |    7 +
 tests/reftests/label-sizing.ref.ui            |11912 +++++++++++++++++++++++
 tests/reftests/label-sizing.ui                |12498 +++++++++++++++++++++++++
 tests/reftests/label-small-ellipsized.ref.ui  |   15 +
 tests/reftests/label-small-ellipsized.ui      |   16 +
 tests/reftests/nonresizable-size.ref.ui       |   15 +
 tests/reftests/nonresizable-size.ui           |   17 +
 tests/reftests/quit-mnemonic.ref.ui           |   19 +
 tests/reftests/quit-mnemonic.ui               |   43 +
 tests/reftests/simple.ref.ui                  |   20 +
 tests/reftests/simple.ui                      |   20 +
 30 files changed, 25940 insertions(+), 44 deletions(-)
---



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