summaryrefslogtreecommitdiffstats
path: root/cppunit
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-02-08 00:15:54 +0100
committerJan Holesovsky <kendy@suse.cz>2011-02-08 00:15:54 +0100
commitca7a520d8c7daa242402acbfed3a965da187de9d (patch)
tree9d5ae02a1a198973aa80fdfe702dc3a3c91452fa /cppunit
parentClean up makefiles (diff)
parentupgrade libwpd to 0.9.1 (diff)
downloadcore-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