[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 2 commits - distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf instsetoo_native/util

[Andras Timar]

 distro-configs/CPWin32-MPL.conf         |    1 -
 distro-configs/CPWin32.conf             |    1 -
 instsetoo_native/util/openoffice.lst.in |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9952fedd1d2ec196ef8ddb59817101b833e70ec4
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Feb 27 02:49:33 2017 -0800

    remove obsoleted option from CP configs
    
    Change-Id: I3c50f07053420b799db491ad828b819fdd2a64de

diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf
index 6accaed..60cd5d9 100644
--- a/distro-configs/CPWin32-MPL.conf
+++ b/distro-configs/CPWin32-MPL.conf
@@ -4,7 +4,6 @@
 --with-theme=tango
 --without-help
 --with-myspell-dicts
---without-system-mesa-headers
 --without-system-postgresql
 --without-junit
 --without-helppack-integration
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index de46331..e8bd314 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -1,6 +1,5 @@
 --with-vendor=Collabora
 --with-branding=icon-themes/galaxy/brand_cp
---without-system-mesa-headers
 --without-system-postgresql
 --without-junit
 --without-helppack-integration
commit a0196536857cae8000b9b17856090f87a65556b8
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Feb 27 02:49:01 2017 -0800

    s/LibreOffice/CollaboraOffice/
    
    Change-Id: I25537b15a806cd904f0d436d7144c59d66f13632

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index b858b29..77343f3 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -39,7 +39,7 @@ Globals
     }
 }
 
-LibreOffice
+CollaboraOffice
 {
     Settings
     {