diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:29 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:29 +0100 |
commit | f8de2744ba1164c35b1b2b4d86b9049698d443c7 (patch) | |
tree | d8605a5e1f87a56118b08e3527ac8fb91a6ff443 | |
parent | Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-exter... (diff) | |
parent | CWS-TOOLING: integrate CWS jl164 (diff) | |
download | dictionaries-f8de2744ba1164c35b1b2b4d86b9049698d443c7.tar.gz dictionaries-f8de2744ba1164c35b1b2b4d86b9049698d443c7.zip |
Merge commit 'ooo/DEV300_m103'
Conflicts:
graphite/makefile.mk
libxml2/makefile.mk
0 files changed, 0 insertions, 0 deletions