summaryrefslogtreecommitdiff
path: root/oox/source/drawingml/chart/chartspaceconverter.cxx
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-02-12 03:34:03 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-02-12 03:34:54 +0100
commit1779d2a3dde60cf705702fcb132bba46aa38fc5b (patch)
tree7fab7ea1fd06d9e4f10083697453ab9189dd121e /oox/source/drawingml/chart/chartspaceconverter.cxx
parent18837a11fff1a93dc489c5427339bcfec4bed6e2 (diff)
nasty merge error
Change-Id: I5afaf03c5aee417ea40cea65b2ac51dde7c35918
Diffstat (limited to 'oox/source/drawingml/chart/chartspaceconverter.cxx')
0 files changed, 0 insertions, 0 deletions