summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 13:01:17 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 13:01:17 +0000
commit8f7a86bbf931852ec8b2283dee5ad8f14a36112d (patch)
tree229541d1dae1e28ebd3c3cbe7e6c6e5b2c5dd26c /desktop/inc
parent567ada345e399dfa4355e30b5a1dc4c9c6684f89 (diff)
INTEGRATION: CWS sb59 (1.12.66); FILE MERGED
2006/09/20 10:59:50 sb 1.12.66.2: Manually resolved merge conflict against 1.13 (SRC680m185). 2006/08/10 12:04:54 sb 1.12.66.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'desktop/inc')
0 files changed, 0 insertions, 0 deletions