Rebase against 50f5f9af1c27c4380a7489596d20d8048f003365.

This commit is contained in:
Alistair Leslie-Hughes
2023-03-08 09:45:55 +11:00
parent 70958b46d0
commit aa36637563
6 changed files with 30 additions and 30 deletions

View File

@@ -1,7 +1,7 @@
From acd27b95daa9e118fc2c1b4191fd9a7c828ae017 Mon Sep 17 00:00:00 2001
From 311a382432c4dd6a6d2ded5e6c10c6fe83767646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 5 Jan 2023 21:16:38 +0100
Subject: [PATCH 1/9] winecfg: Move input config options to a dedicated tab.
Subject: [PATCH] winecfg: Move input config options to a dedicated tab.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30984
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
@@ -18,17 +18,17 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
create mode 100644 programs/winecfg/input.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 276471287da..fa155217267 100644
index 9d60385414f..a88bff34a92 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -179,6 +179,7 @@ F: dlls/user32/input.c
@@ -181,6 +181,7 @@ F: dlls/user32/input.c
F: dlls/win32u/input.c
F: dlls/win32u/rawinput.c
F: server/queue.c
+F: programs/winecfg/input.c
Input methods
M: Aric Stewart <aric@codeweavers.com>
M: Rémi Bernon <rbernon@codeweavers.com>
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 80d2f1991dc..5c46b935234 100644
--- a/programs/winecfg/Makefile.in
@@ -353,5 +353,5 @@ index 215cd6534a2..cd7b7552a1e 100644
break;
}
--
2.39.1
2.39.2