[gtk: 2/2] Merge branch 'wip/chergert/sysprof-3' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 3f6b64fc1de3d782c9c081b91b6af0515245c3e1
Merge: 853e832702 3a0beeadc5
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu May 30 03:26:59 2019 +0000

    Merge branch 'wip/chergert/sysprof-3' into 'master'
    
    profiler: port GdkProfiler to sysprof-3
    
    See merge request GNOME/gtk!886

 config.h.meson                  |    3 +
 gdk/capture/sp-capture-types.h  |  224 --------
 gdk/capture/sp-capture-writer.c | 1123 ---------------------------------------
 gdk/capture/sp-capture-writer.h |  132 -----
 gdk/capture/sp-clock.c          |   52 --
 gdk/capture/sp-clock.h          |   55 --
 gdk/gdk.c                       |    4 +-
 gdk/gdkprofiler.c               |   64 +--
 gdk/meson.build                 |   13 +-
 meson.build                     |   11 +
 meson_options.txt               |    2 +
 11 files changed, 56 insertions(+), 1627 deletions(-)
---