diff options
| author |  Subv | 2016-11-30 23:28:31 -0500 |
|---|---|---|
| committer | Subv | 2016-11-30 23:28:31 -0500 |
| commit | 2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6 (patch) | |
| tree | 4a7069d46afb5655af9f091c09041211653fb75f /src/core/hle/service/srv.cpp | |
| parent | A bit of a redesign. (diff) | |
| download | yuzu-2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6.tar.gz yuzu-2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6.tar.xz yuzu-2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6.zip | |
Fixed the rebase mistakes.
Diffstat (limited to 'src/core/hle/service/srv.cpp')
| -rw-r--r-- | src/core/hle/service/srv.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index 6731afc22..d228e3523 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp | |||
| @@ -6,11 +6,10 @@ | |||
| 6 | 6 | ||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 9 | #include "core/hle/service/srv.h" | ||
| 10 | #include "core/hle/kernel/client_session.h" | 9 | #include "core/hle/kernel/client_session.h" |
| 10 | #include "core/hle/kernel/server_session.h" | ||
| 11 | #include "core/hle/kernel/event.h" | 11 | #include "core/hle/kernel/event.h" |
| 12 | #include "core/hle/service/srv.h" | 12 | #include "core/hle/service/srv.h" |
| 13 | #include "core/hle/kernel/server_session.h" | ||
| 14 | 13 | ||
| 15 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 14 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 16 | // Namespace SRV | 15 | // Namespace SRV |