diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:52:20 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:52:20 +0200 |
| commit | 7a6dead55d7376c69554bd7f6c5b8278af14701a (patch) | |
| tree | fa84e8c5a7c53f4c54012cac597b45c48493382e /zlib | |
| parent | 0f9a1b73ad2943b0fa3a9b1e6c81150c712b2a52 (diff) | |
| parent | b61b156d52d24a7cfc42fb47d922bbc292bc6835 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-extern-sys
Conflicts:
graphite/graphite2-0.9.2.patch
Diffstat (limited to 'zlib')
0 files changed, 0 insertions, 0 deletions