summaryrefslogtreecommitdiff
path: root/autodoc/source/parser_i/idl/tkp_uidl.cxx
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2009-12-14 11:28:36 +0100
committerVladimir Glazunov <vg@openoffice.org>2009-12-14 11:28:36 +0100
commit3ae6837ccd2d6bca0ddf2e0de15c9f2d7c790316 (patch)
tree6367d8dfbf943afb129477191a6256aacda7f3f4 /autodoc/source/parser_i/idl/tkp_uidl.cxx
parent08def50728729806b30b1fb5376cdc4f82388520 (diff)
#i10000# resolve conflict
Diffstat (limited to 'autodoc/source/parser_i/idl/tkp_uidl.cxx')
0 files changed, 0 insertions, 0 deletions