[glib: 4/4] Merge branch 'test-timeout' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 74d2a8e50012a8ca567a460d945929757bdc5c0e
Merge: 8f115b63b 03413d5a8
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Nov 2 11:02:32 2018 +0000

    Merge branch 'test-timeout' into 'master'
    
    meson: Increase test timeouts
    
    See merge request GNOME/glib!407

 gio/tests/meson.build      | 2 +-
 glib/tests/meson.build     | 6 ++++--
 gobject/tests/meson.build  | 2 +-
 meson.build                | 2 ++
 tests/gobject/meson.build  | 2 +-
 tests/meson.build          | 2 +-
 tests/refcount/meson.build | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)
---