6a75a47be7
Conflicts: automation/source/communi/communi.cxx automation/source/server/recorder.cxx automation/source/server/server.cxx basctl/source/basicide/basobj2.cxx |
||
---|---|---|
.. | ||
certificatechooser.cxx | ||
certificatechooser.src | ||
certificateviewer.cxx | ||
certificateviewer.src | ||
dialogs.hrc | ||
digitalsignaturesdialog.cxx | ||
digitalsignaturesdialog.hrc | ||
digitalsignaturesdialog.src | ||
helpids.hrc | ||
macrosecurity.cxx | ||
macrosecurity.src | ||
makefile.mk | ||
resourcemanager.cxx | ||
resourcemanager.hxx | ||
stbcontrl.cxx | ||
warnings.cxx | ||
warnings.src |