[glib: 4/4] Merge branch 'clang-format-nonliteral' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 89f964e3333f1ce5adf1948be34b8ee1d57ae060
Merge: 2e2f737f9 6cae01c2f
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri May 1 16:57:53 2020 +0000

    Merge branch 'clang-format-nonliteral' into 'master'
    
    Silence clang errors about -Wformat-nonliteral due to missing intermediate attributes
    
    See merge request GNOME/glib!1440

 gio/gregistrysettingsbackend.c | 4 ++--
 gmodule/gmodule-win32.c        | 2 +-
 meson.build                    | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)
---