[gtk: 2/2] Merge branch 'fix-gen-demo-conf' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 4cbc5ed20af47ced275813fc48342cc3414738e4
Merge: ab6e4bfc8d c18a1ac1a1
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue May 18 10:31:57 2021 +0000

    Merge branch 'fix-gen-demo-conf' into 'master'
    
    Fix generating demo_conf.h on builds without GIT in PATH
    
    See merge request GNOME/gtk!3562

 build-aux/meson/gen-demo-header.py | 21 +++++++++++++--------
 demos/meson.build                  |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)
---