[gtk: 3/3] Merge branch 'master.msvc' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 34841c3a5fe2ba5dcbc7a54ab33afd89572b5d38
Merge: 185f0181ac c370b8f309
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 5 18:31:08 2020 +0000

    Merge branch 'master.msvc' into 'master'
    
    Fix latest GTK master on Visual Studio
    
    See merge request GNOME/gtk!2028

 demos/gtk-demo/listview_colors.c                  |  2 ++
 demos/gtk-demo/listview_settings.c                |  2 ++
 meson.build                                       | 16 ++++++++++------
 modules/media/gtkgstmediafile.c                   |  3 ---
 modules/media/meson.build                         |  6 +++++-
 modules/printbackends/gtkprintbackendcloudprint.c |  3 ---
 modules/printbackends/gtkprintbackendcups.c       |  3 ---
 modules/printbackends/gtkprintbackendfile.c       |  3 ---
 modules/printbackends/gtkprintbackendlpr.c        |  3 ---
 modules/printbackends/meson.build                 |  1 +
 10 files changed, 20 insertions(+), 22 deletions(-)
---