summaryrefslogtreecommitdiff
path: root/readlicense_oo
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-02-08 00:15:12 +0100
committerJan Holesovsky <kendy@suse.cz>2011-02-08 00:15:12 +0100
commite1740510b7786803134411d9aa3a125642cf9fdc (patch)
tree24b829557ce13acc23dbd4b3da25fb2e9726a0c5 /readlicense_oo
parent06fc1ee4c4ee8de3a4d758cbca761a5e80a0873f (diff)
parent99fe0a11ca01d9e7f10acc1e138a579457c2f004 (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.odtbin24738 -> 43415 bytes
-rw-r--r--readlicense_oo/odt/LICENSE.odtbin167118 -> 154001 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt
index 673bf9f3aa56..b9246dc6936d 100644
--- a/readlicense_oo/odt/CREDITS.odt
+++ b/readlicense_oo/odt/CREDITS.odt
Binary files differ
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
index 67acbd1d1521..13f3649d593d 100644
--- a/readlicense_oo/odt/LICENSE.odt
+++ b/readlicense_oo/odt/LICENSE.odt
Binary files differ