[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - instsetoo_native/inc_common setup_native/source

[Andras Timar]

 instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp  |binary
 setup_native/source/packinfo/finals_instsetoo.txt.in                |    2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c093abcd85f01f7a9079882430e76b60685839e7
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jul 2 19:17:33 2018 +0200

    fixup of 'Enable MSP patching'
    
    Change-Id: I57745de650f2ba0a19999bda55aebcd0db1f8c5b

diff --git a/setup_native/source/packinfo/finals_instsetoo.txt.in b/setup_native/source/packinfo/finals_instsetoo.txt.in
index b871d6c64238..d7395c464f2e 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt.in
+++ b/setup_native/source/packinfo/finals_instsetoo.txt.in
@@ -30,4 +30,4 @@
 # OpenOffice	pro		de			\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack	pro	es	\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE			pro		en-US		\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-CollaboraOffice		pro		en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW		c:\lo\src\cp-6.0-5- at WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5-Win_ at WINDOWS_SDK_ARCH@.msi
+CollaboraOffice		pro		en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW		c:\lo\src\cp-6.0-5- at WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5_Win_ at WINDOWS_SDK_ARCH@.msi
commit 94711800344721bb99bae92b2b11605ad0b75ce6
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jul 2 19:15:58 2018 +0200

    Collabora Office Windows installer bitmaps with white background
    
    Change-Id: I818381269e085ca58cb529c76dc2bf5dba1e3c5c

diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 6df027c6e13e..c40ecd8b02fc 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index 496e0d308c89..0fc8f7fb6c72 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ