summaryrefslogtreecommitdiff
path: root/editeng/inc
diff options
context:
space:
mode:
authoros <os@openoffice.org>2011-02-16 13:23:44 +0100
committeros <os@openoffice.org>2011-02-16 13:23:44 +0100
commit9310807dd3af0d878d0989dbab48ea10cb71780d (patch)
tree0cd06b57b07e25453830c4d337c506695402a2f4 /editeng/inc
parentb18b90648ef628467de81b23986954e25f9c268f (diff)
merge errors fixed
Diffstat (limited to 'editeng/inc')
0 files changed, 0 insertions, 0 deletions