[msitools: 2/2] Merge branch 'master' into 'master'

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

commit de88b9119d2eef4f45d51a49854ab8bf1c792552
Merge: 7d6c143 d282ca0
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Wed Sep 29 08:15:28 2021 +0000

    Merge branch 'master' into 'master'
    
    Support DefaultVersion and CompanionFile in File element
    
    See merge request GNOME/msitools!43

 tools/wixl/builder.vala | 38 +++++++++++++++++++++++++++++++++++++-
 tools/wixl/msi.vala     | 13 +++++++------
 tools/wixl/wix.vala     |  2 ++
 3 files changed, 46 insertions(+), 7 deletions(-)
---