[gst-debugger: 3/3] Merge branch 'master' into 'master'

[Marcin Kolny <mkolny src gnome org>]

commit 0deb1b0d20f9a63e75ef549dab58aa7b61a414ec
Merge: 068787f f9e4ae3
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Tue Apr 3 21:49:41 2018 +0000

    Merge branch 'master' into 'master'
    
    GStreamer 1.14 compatibily and lighter build support
    
    See merge request GNOME/gst-debugger!1

 meson.build                      | 15 +++++++++------
 meson_options.txt                |  1 +
 src/debugserver/gstdebugserver.c |  2 +-
 src/debugserver/meson.build      |  2 +-
 src/meson.build                  |  5 ++++-
 5 files changed, 16 insertions(+), 9 deletions(-)
---