Merge remote-tracking branch 'upstream/master' into qt-wacom-serial

2023-01-07 11:38:25 +06:00
parent a91015fe04 95cf08611c
commit 3884e5874b
23 changed files with 230 additions and 85 deletions
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -1088,7 +1088,7 @@ std::array<uint32_t, 256> x11_to_xt_2 {
    0x53,
    0x138,
    0x55,
-    0x35,
+    0x56,
    0x57,
    0x58,
    0x56,