[glib: 3/3] Merge branch '1377-g-assert-cmpfloat' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 6e784963f43026a29ce0633f93a3ffdafa95fb46
Merge: b9aed426d 9e46b2ef1
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Jun 21 10:35:37 2018 +0000

    Merge branch '1377-g-assert-cmpfloat' into 'master'
    
    Resolve "g_assert_cmpfloat trips -Wdouble-promotion on Clang"
    
    Closes #1377
    
    See merge request GNOME/glib!127

 gio/Makefile.am   | 10 +++++-----
 glib/gtestutils.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
---