[gtk: 5/5] Merge branch 'matthiasc/for-master' into 'master'




commit d5114cc18da7ff1083ce2e7dfdee7bf3a4f146be
Merge: 0540337531 40d7092f4a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 23 21:36:07 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2464

 .gitlab-ci.yml                    |   4 +-
 .gitlab-ci/test-msys2.sh          |   2 +-
 docs/reference/gtk/building.md    |  78 ++++++++++++------
 gtk/gtkbuiltinicon.c              |   4 +-
 gtk/gtkfontchooserwidget.c        |   1 +
 gtk/gtkpaned.c                    |   4 +-
 gtk/gtkspinner.c                  |   4 +-
 gtk/gtkwidget.c                   |   5 +-
 gtk/meson.build                   |   8 +-
 meson.build                       | 164 ++++++++++++++++----------------------
 meson_options.txt                 | 142 +++++++++++++++++++++++----------
 modules/printbackends/meson.build |  12 +--
 12 files changed, 239 insertions(+), 189 deletions(-)
---


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