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 /Makefile.in | |
| 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 'Makefile.in')
0 files changed, 0 insertions, 0 deletions