summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-06-07 17:03:27 +0200
committerJoachim Lingner <jl@openoffice.org>2010-06-07 17:03:27 +0200
commita42036353ad2a1a8c1b9f1344ad27547786dfd1f (patch)
tree4e3e6ded05cc652afa8486aeaada70918f6f937a /io
parentf185517358e1d23504324b08535795dcd3bbff1b (diff)
jl152 #i77196# fixing merge conflicts
Diffstat (limited to 'io')
0 files changed, 0 insertions, 0 deletions