diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:12 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:12 +0100 |
| commit | e1740510b7786803134411d9aa3a125642cf9fdc (patch) | |
| tree | 24b829557ce13acc23dbd4b3da25fb2e9726a0c5 /readlicense_oo | |
| parent | 06fc1ee4c4ee8de3a4d758cbca761a5e80a0873f (diff) | |
| parent | 99fe0a11ca01d9e7f10acc1e138a579457c2f004 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sfx2/source/appl/appserv.cxx
Diffstat (limited to 'readlicense_oo')
| -rw-r--r-- | readlicense_oo/odt/CREDITS.odt | bin | 24738 -> 43415 bytes |
| -rw-r--r-- | readlicense_oo/odt/LICENSE.odt | bin | 167118 -> 154001 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt Binary files differindex 673bf9f3aa56..b9246dc6936d 100644 --- a/readlicense_oo/odt/CREDITS.odt +++ b/readlicense_oo/odt/CREDITS.odt diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt Binary files differindex 67acbd1d1521..13f3649d593d 100644 --- a/readlicense_oo/odt/LICENSE.odt +++ b/readlicense_oo/odt/LICENSE.odt |