diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:45:25 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-13 11:45:25 +0200 |
commit | 8e3b6ac3249200da87d1bd4b7ef0c7e51b706dd6 (patch) | |
tree | 12bb0706707688f2e6143e0b8be08b46db382c66 /tools | |
parent | e10b5bef6746338777cb350a87cf7aa5890c4809 (diff) | |
parent | 23207a4338732e755039eb7b627acdb566960e05 (diff) |
Merge commit 'ooo/OOO330_m10'
Conflicts:
vcl/unx/source/fontmanager/fontconfig.cxx
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions