Merge remote-tracking branch 'upstream/master' into newqt

2022-02-16 00:16:01 +06:00
parent 0b664b5a12 ba7befbbca
commit 775fd2b192
2 changed files with 1 additions and 2 deletions
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -808,7 +808,6 @@ std::array<uint32_t, 256> x11_to_xt_vnc
    0,
    0,
    0,
-    0,
    0x1D,
    0x11D,
    0x2A,