diff options
| author |  Ameer | 2020-07-08 21:15:49 -0400 |
|---|---|---|
| committer | Ameer | 2020-07-08 21:15:49 -0400 |
| commit | 4489ea6f532a501ca4cc379d8d8fb50ce1af27d7 (patch) | |
| tree | 52f62331d39f338f6ae6d0fd56831bdd577943a9 /src/core/arm | |
| parent | Address PR feedback, fix axis button thresholding (diff) | |
| parent | Merge pull request #4266 from jbeich/freebsd (diff) | |
| download | yuzu-4489ea6f532a501ca4cc379d8d8fb50ce1af27d7.tar.gz yuzu-4489ea6f532a501ca4cc379d8d8fb50ce1af27d7.tar.xz yuzu-4489ea6f532a501ca4cc379d8d8fb50ce1af27d7.zip | |
Rebase to master, fix merge conflicts
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/cpu_interrupt_handler.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/arm/cpu_interrupt_handler.cpp b/src/core/arm/cpu_interrupt_handler.cpp index 2f1a1a269..df0350881 100644 --- a/src/core/arm/cpu_interrupt_handler.cpp +++ b/src/core/arm/cpu_interrupt_handler.cpp | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include "common/thread.h" | 5 | #include "common/thread.h" |
| 8 | #include "core/arm/cpu_interrupt_handler.h" | 6 | #include "core/arm/cpu_interrupt_handler.h" |
| 9 | 7 | ||