diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:54 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:54 +0100 |
| commit | d59bf2a6f99e2a6544fe78666dbbff0239f2e788 (patch) | |
| tree | 5e7e28e4b19d5424611f091a1a0d6004c8239aca | |
| parent | 7c9c34ddb6047a423b7f7c85f63b0f99d5814719 (diff) | |
| parent | 42a8568ffba726cd03054933b6af60288cab8bdd (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
libwpd/makefile.mk
0 files changed, 0 insertions, 0 deletions