summarylogtreecommitdiffstats
path: root/gui.diff
diff options
context:
space:
mode:
Diffstat (limited to 'gui.diff')
-rw-r--r--gui.diff2
1 files changed, 0 insertions, 2 deletions
diff --git a/gui.diff b/gui.diff
index 78ed8ce1ae21..b1134fd6da35 100644
--- a/gui.diff
+++ b/gui.diff
@@ -21,8 +21,6 @@
}
void InputPanel::on_timer(const EmulatedControllerPtr& emulated_controller, const ControllerPtr& controller)
-diff --git a/src/gui/input/panels/InputPanel.h b/src/gui/input/panels/InputPanel.h
-index 6ac15089..3d7bb3ab 100644
--- a/src/gui/input/panels/InputPanel.h
+++ b/src/gui/input/panels/InputPanel.h
@@ -12,9 +12,9 @@ class wxComboBox;