[msitools: 6/6] Merge branch 'nss' into 'master'

[Marc-André Lureau <malureau src gnome org>]

commit b7d7e16e131b3ec472845fdaa726d8dae84d2c15
Merge: 3b9cc1c 69a3fa9
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Wed Jan 15 16:08:39 2020 +0000

    Merge branch 'nss' into 'master'
    
    CI fixes
    
    See merge request GNOME/msitools!19

 .gitlab-ci.yml                   |   2 -
 data/Makefile.am                 |   2 -
 data/wixl/OpenEXR.wxi            |   4 +-
 data/wixl/adwaita-icon-theme.wxi | 278 ++++++++++++++++++++-------------------
 data/wixl/ilmbase.wxi            |  10 +-
 data/wixl/libvirt.wxi            |   2 +
 data/wixl/nspr.wxi               |  27 ----
 data/wixl/nss.wxi                | 151 ---------------------
 8 files changed, 149 insertions(+), 327 deletions(-)
---