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

[Matthias Clasen <matthiasc src gnome org>]

commit 0c15463e4161147f33c93ed79057d7d68ebc3294
Merge: 86c7fceb09 5df1356295
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 20 12:23:12 2020 +0000

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

 gsk/gskdebug.c        |  3 +--
 gsk/gskdebugprivate.h |  1 -
 gtk/gtkmain.c         |  4 ++--
 gtk/inspector/logs.c  |  6 ++++++
 gtk/inspector/logs.ui | 12 ++++++++++++
 5 files changed, 21 insertions(+), 5 deletions(-)
---