diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:56 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:56 +0200 |
| commit | 84c83035918d1f495b638e874118611c41f7c04d (patch) | |
| tree | 46792c3f1e699b4ae5ca8dea8b74927e083c5266 /codemaker | |
| parent | baf97f3cc9b8b7f90c2a1bf2fff53f4996b594d2 (diff) | |
| parent | 55110f462459ebee167571da6ea72c19376ad50f (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sal/osl/unx/diagnose.c
Diffstat (limited to 'codemaker')
0 files changed, 0 insertions, 0 deletions