| commit | ecca07916d1c559a8b6df63d77fc9ffd1eb1a998 | [log] [tgz] |
|---|---|---|
| author | nift4 <nift4@protonmail.com> | Fri May 19 10:34:06 2023 +0200 |
| committer | nift4 <nift4@protonmail.com> | Fri May 19 10:34:06 2023 +0200 |
| tree | 0f1474999971559b20aac78513359d14f50c9470 | |
| parent | 7f67417ee934734bb229b8e47fc60991562f7e83 [diff] | |
| parent | 57cdcedf1bde06195f782fd2cfcf302050245da6 [diff] |
Merge branch 'master' of github.com:TigerVNC/tigervnc into HEAD Conflicts: .github/workflows/build.yml cmake/Modules/FindPixman.cmake common/network/UnixSocket.cxx common/rfb/CMakeLists.txt common/rfb/Region.cxx common/rfb/SDesktop.h unix/vncpasswd/vncpasswd.cxx Change-Id: I097966d482e0a99a47fb44e6bb9374250bb2db0f