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 | ca7a520d8c7daa242402acbfed3a965da187de9d (patch) | |
tree | 9d5ae02a1a198973aa80fdfe702dc3a3c91452fa /cppunit | |
parent | Clean up makefiles (diff) | |
parent | upgrade libwpd to 0.9.1 (diff) | |
download | core-ca7a520d8c7daa242402acbfed3a965da187de9d.tar.gz core-ca7a520d8c7daa242402acbfed3a965da187de9d.zip |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
libwpd/makefile.mk
Diffstat (limited to 'cppunit')
0 files changed, 0 insertions, 0 deletions