This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-iconset
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 101374f877e7239b34168901491951df856207b8
Merge: 35594b4a4c 0be1dfaa23
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Aug 2 23:41:28 2024 +0200
Merge branch 'trunk' into Pilot-Pirx-iconset
main/cui/source/options/optinet2.src | 643 ++++++++++-----------
.../source/deployment/gui/dp_gui_backend.src | 2 -
.../deployment/gui/dp_gui_dependencydialog.src | 77 ++-
.../source/deployment/gui/dp_gui_dialog.src | 4 -
.../source/deployment/gui/dp_gui_updatedialog.src | 446 +++++++-------
main/extensions.lst | 2 +-
.../wizard/desktop/lang/nl/url_transfer.htm | 2 +-
main/sc/source/ui/cctrl/dpcontrol.src | 78 ++-
main/sc/source/ui/src/condfrmt.src | 351 ++++++-----
9 files changed, 769 insertions(+), 836 deletions(-)
