diff options
author | Michael Stahl <mstahl@redhat.com> | 2011-11-16 10:56:37 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-11-16 10:58:48 +0100 |
commit | 34578b7c2706d2cca95eeb266aeb0498078bb55a (patch) | |
tree | e71a3f88c14e61cd83a142404a12d5921032b7e7 /officecfg | |
parent | 530a76c8effedc921cbf70293b6730620ec2fef2 (diff) |
libexttextcat: conflict in 69b04c22986b03c675cf4925f76721190aa5ba82
Diffstat (limited to 'officecfg')
0 files changed, 0 insertions, 0 deletions