diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
commit | d833bb65d53b9a4375fa71cc485b4719fdb0ee53 (patch) | |
tree | d1271339e1c3a660e4788a5c9913bfe54e0271f1 /win | |
parent | e431d90065d277e62fa4f81a1654790f58a84146 (diff) | |
parent | 76577e1e2602f3c30859a176808c433a263e1b0a (diff) | |
download | mariadb-git-d833bb65d53b9a4375fa71cc485b4719fdb0ee53.tar.gz |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'win')
-rw-r--r-- | win/packaging/WixUIBannerBmp.jpg | bin | 3703 -> 3856 bytes |
-rw-r--r-- | win/packaging/WixUIDialogBmp.jpg | bin | 12411 -> 9745 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/win/packaging/WixUIBannerBmp.jpg b/win/packaging/WixUIBannerBmp.jpg Binary files differindex a04177bed9d..66256b79255 100644 --- a/win/packaging/WixUIBannerBmp.jpg +++ b/win/packaging/WixUIBannerBmp.jpg diff --git a/win/packaging/WixUIDialogBmp.jpg b/win/packaging/WixUIDialogBmp.jpg Binary files differindex 466cdc461c8..c6ddf12bd2a 100644 --- a/win/packaging/WixUIDialogBmp.jpg +++ b/win/packaging/WixUIDialogBmp.jpg |