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

[Philip Withnall <pwithnall src gnome org>]

commit 7aa52a7d53a516e6166035ab747485bdcd5212a1
Merge: 985210849 b1af12567
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Nov 2 10:43:52 2018 +0000

    Merge branch '2-58-test-timeout' into 'glib-2-58'
    
    [2.58] meson: Increase test timeouts
    
    See merge request GNOME/glib!445

 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(-)
---