summaryrefslogtreecommitdiff
path: root/xmloff/prj
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-06 08:41:49 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-06 08:41:49 +0000
commitfadab63233399703e7a23b92354c9ae8d7de5b2d (patch)
tree184b61131f063e0dc355aa9f595a16d9e190cea3 /xmloff/prj
parentc9aa71be2103924e52d8431b3f3f0ade460aa7c9 (diff)
INTEGRATION: CWS oj14 (1.2.6); FILE MERGED
2007/06/04 17:53:05 oj 1.2.6.2: RESYNC: (1.2-1.4); FILE MERGED 2007/04/23 10:21:05 oj 1.2.6.1: resolved merge conflict
Diffstat (limited to 'xmloff/prj')
0 files changed, 0 insertions, 0 deletions