summaryrefslogtreecommitdiff
path: root/readlicense_oo/odt
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2010-10-13 13:22:42 +0100
committerNoel Power <noel.power@novell.com>2010-10-13 13:22:42 +0100
commitace843304cba4ea36bba8e2d6898be426837ee6c (patch)
tree724620a0dc1b37070a7a592618fd018a32dbb138 /readlicense_oo/odt
parent150c9846abeaab2ece2a7b35f61e83695abd5fdd (diff)
parent86423ced17e0444f63e6a8bd5ef779717b11a7ee (diff)
Merge commit 'origin/master'
Conflicts: vbahelper/source/vbahelper/vbadialogbase.cxx
Diffstat (limited to 'readlicense_oo/odt')
0 files changed, 0 insertions, 0 deletions