You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2026/01/08 14:09:12 UTC

(openoffice) branch Pilot-Pirx-iconset updated (1eda15df69 -> 01a976a250)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch Pilot-Pirx-iconset
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from 1eda15df69 Merge branch 'trunk' into Pilot-Pirx-iconset
     add c7559245db Add white border to magnify cursor (OS/2)
     add 6de9402977 Replace some cursors with System Pointers (OS/2)
     add a7527837f2 Cleanup
     new 01a976a250 Merge branch 'trunk' into Pilot-Pirx-iconset

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/sw/source/core/layout/flylay.cxx   | 1571 +++++++++++++++----------------
 main/vcl/WinResTarget_vcl.mk            |    5 -
 main/vcl/inc/os2/salids.hrc             |   10 +-
 main/vcl/os2/source/app/makefile.mk     |   15 +-
 main/vcl/os2/source/src/hsizebar.ptr    |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/hsplit.ptr      |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/magnify.ptr     |  Bin 1190 -> 1190 bytes
 main/vcl/os2/source/src/makefile.mk     |    7 +-
 main/vcl/os2/source/src/move.ptr        |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/salsrc.rc       |    5 -
 main/vcl/os2/source/src/vsizebar.ptr    |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/vsplit.ptr      |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/window/makefile.mk  |   10 +-
 main/vcl/os2/source/window/salframe.cxx |  716 +++++++-------
 14 files changed, 1149 insertions(+), 1190 deletions(-)
 delete mode 100644 main/vcl/os2/source/src/hsizebar.ptr
 delete mode 100644 main/vcl/os2/source/src/hsplit.ptr
 delete mode 100644 main/vcl/os2/source/src/move.ptr
 delete mode 100644 main/vcl/os2/source/src/vsizebar.ptr
 delete mode 100644 main/vcl/os2/source/src/vsplit.ptr

(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-iconset

Posted by ms...@apache.org.
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 01a976a25038a2d0aa48fe6da059b825a9c87fd9
Merge: 1eda15df69 a7527837f2
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Jan 8 15:08:37 2026 +0100

    Merge branch 'trunk' into Pilot-Pirx-iconset

 main/sw/source/core/layout/flylay.cxx   | 1571 +++++++++++++++----------------
 main/vcl/WinResTarget_vcl.mk            |    5 -
 main/vcl/inc/os2/salids.hrc             |   10 +-
 main/vcl/os2/source/app/makefile.mk     |   15 +-
 main/vcl/os2/source/src/hsizebar.ptr    |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/hsplit.ptr      |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/magnify.ptr     |  Bin 1190 -> 1190 bytes
 main/vcl/os2/source/src/makefile.mk     |    7 +-
 main/vcl/os2/source/src/move.ptr        |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/salsrc.rc       |    5 -
 main/vcl/os2/source/src/vsizebar.ptr    |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/src/vsplit.ptr      |  Bin 1190 -> 0 bytes
 main/vcl/os2/source/window/makefile.mk  |   10 +-
 main/vcl/os2/source/window/salframe.cxx |  716 +++++++-------
 14 files changed, 1149 insertions(+), 1190 deletions(-)