diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
| commit | 07c1d34ec78dd6e980c4ae370042ab5e3870aa0b (patch) | |
| tree | 15568d84be2d77cb24edb7e9cc53fa0b1ceef820 /distro-configs | |
| parent | 23bfe8097571fcf5c9ac223100c2fef9087aad01 (diff) | |
| parent | b75801e6ace5eec09c5d04f2f0f9a373acc1a21c (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
configure.in
distro-configs/LibreOfficeMacOSX.conf
distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeWin32.conf
download
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/gbuild/CppunitTest.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/LibreOfficeMacOSX.conf | 5 | ||||
| -rw-r--r-- | distro-configs/OxygenOfficeLinux.conf | 2 | ||||
| -rw-r--r-- | distro-configs/OxygenOfficeWin32.conf | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 28f49fa3838c..1fb7e4ed54e0 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -1,8 +1,6 @@ --with-vendor=The Document Foundation ---enable-opengl ---enable-hids +--enable-epm --enable-binfilter ---with-fonts --with-java-target-version=1.5 --enable-ext-presenter-minimizer --enable-ext-presenter-console @@ -12,4 +10,5 @@ --enable-ext-scripting-beanshell --enable-ext-scripting-javascript --enable-ext-scripting-python +--enable-ext-nlpsolver --with-extension-integration diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 8a3a7efea779..a1a432737041 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -1,5 +1,5 @@ --with-vendor=OxygenOffice Professional Team ---with-build-version=OxygenOffice Professional Alpha 3.5.0 M000 - OxygenOffice Build 0 +--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png --enable-binfilter diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index 8c5f4021b58a..ba6f999b653c 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -1,5 +1,5 @@ --with-vendor=OxygenOffice Professional Team ---with-build-version=OxygenOffice Professional Alpha 3.5.0 M000 - OxygenOffice Build 0 +--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png --enable-binfilter |