summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-07-28 18:38:56 +0200
committerJan Holesovsky <kendy@suse.cz>2011-07-28 18:38:56 +0200
commit99799f2b9647038321027e43a9589ffc89b02113 (patch)
tree42c7fb9b63edaab6362fe4f75e7413a16e19ceab
parent64b8f40b06faf4a3839faed9ead8cddbca8a4e59 (diff)
parentd2c65a7a532ab1e9389ade98cd28fbae8d16bb27 (diff)
Merge commit 'libreoffice-3.4.2.3'
Conflicts: boost/boost.windows.patch
0 files changed, 0 insertions, 0 deletions