[msitools: 2/2] Merge branch 'feature/support-use-of-file-key-for-custom-action' into 'master'

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

commit e9fc1b4af9a44bb2f38936adb042f698422b5ef4
Merge: 2143df9 b0c3c4c
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Fri Sep 13 07:23:31 2019 +0000

    Merge branch 'feature/support-use-of-file-key-for-custom-action' into 'master'
    
    tools/wixl: Support use of FileKey in CustomAction
    
    See merge request GNOME/msitools!16

 tools/wixl/builder.vala | 9 ++++++++-
 tools/wixl/wix.vala     | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)
---