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 68a0dc84674962c80dd580a4839e3644769e75b0
Merge: 2f18439c90 2154eb031b
Author: mseidel <[email protected]>
AuthorDate: Wed Dec 10 22:56:04 2025 +0100

    Merge branch 'trunk' into Pilot-Pirx-iconset

 README.md                                       |   2 +-
 main/shell/source/unix/misc/senddoc.sh          |  43 ++++++-
 main/vcl/WinResTarget_vcl.mk                    |   9 --
 main/vcl/inc/os2/salids.hrc                     | 150 +++++++++++------------
 main/vcl/inc/win/salids.hrc                     |  20 ++-
 main/vcl/os2/source/src/makefile.mk             | 138 +++++++++++----------
 main/vcl/os2/source/src/salsrc.rc               | 150 ++++++++++++-----------
 main/vcl/os2/source/src/tblsele.ptr             | Bin 1190 -> 1190 bytes
 main/vcl/os2/source/src/tblsels.ptr             | Bin 1190 -> 1190 bytes
 main/vcl/os2/source/src/tblselse.ptr            | Bin 1190 -> 1190 bytes
 main/vcl/os2/source/src/tblselsw.ptr            | Bin 1190 -> 1190 bytes
 main/vcl/os2/source/src/tblselw.ptr             | Bin 1190 -> 1190 bytes
 main/vcl/source/glyphs/graphite_layout.cxx      |   6 +-
 main/vcl/win/source/src/50.png                  | Bin 125 -> 0 bytes
 main/vcl/win/source/src/cross.cur               | Bin 326 -> 0 bytes
 main/vcl/win/source/src/hand.cur                | Bin 326 -> 0 bytes
 main/vcl/win/source/src/hsize.cur               | Bin 326 -> 0 bytes
 main/vcl/win/source/src/move.cur                | Bin 326 -> 0 bytes
 main/vcl/win/source/src/neswsize.cur            | Bin 326 -> 0 bytes
 main/vcl/win/source/src/nwsesize.cur            | Bin 326 -> 0 bytes
 main/vcl/win/source/src/refhand.cur             | Bin 326 -> 0 bytes
 main/vcl/win/source/src/salsrc.rc               | 154 +++++++++++-------------
 main/vcl/win/source/src/tblsele.cur             | Bin 326 -> 326 bytes
 main/vcl/win/source/src/tblsels.cur             | Bin 326 -> 326 bytes
 main/vcl/win/source/src/tblselse.cur            | Bin 326 -> 326 bytes
 main/vcl/win/source/src/tblselsw.cur            | Bin 326 -> 326 bytes
 main/vcl/win/source/src/tblselw.cur             | Bin 326 -> 326 bytes
 main/vcl/win/source/src/vsize.cur               | Bin 326 -> 0 bytes
 main/vcl/win/source/window/salframe.cxx         | 134 ++++++++++-----------
 main/xmloff/source/text/XMLTextFrameContext.cxx |  14 ++-
 30 files changed, 421 insertions(+), 399 deletions(-)

Reply via email to