diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2009-11-16 15:38:48 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2009-11-16 15:38:48 +0100 |
commit | 57f9b4fffac7a86aec79b8c5eefc4e31d1ffacc2 (patch) | |
tree | 0246a3e5560aac541ce1be20b6f920b944a82d14 /scp2/source/ooo/common_brand.scp | |
parent | 306ac896af18d7c70a9d5bcf8a75bcb9c4a730ef (diff) |
masterfix: #i10000# wrong conflict resolution, here or in the cws ause10*
Diffstat (limited to 'scp2/source/ooo/common_brand.scp')
0 files changed, 0 insertions, 0 deletions