summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-01-24 14:35:05 +0100
committerGitHub <noreply@github.com>2017-01-24 14:35:05 +0100
commit63f56ccd023af0ffeb7bac64e9c91b86760d5aa3 (patch)
tree91e66333eb3c2bdf50b37f06199b9901cd6c9110 /Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
parent221be63cb4b8615f3b889807cefb0d84a8211d61 (diff)
parent803ea7b14365c05b437dfb616c7c4cc1b891ba16 (diff)
Merge pull request #4741 from Orphis/cmake_cleanup
CMake cleanup
Diffstat (limited to 'Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp')
-rw-r--r--Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
index cad10dce0f..3426c594f1 100644
--- a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
+++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
@@ -7,11 +7,12 @@
#include <wx/sizer.h>
#include <wx/stattext.h>
+#include "DolphinWX/NetPlay/PadMapDialog.h"
+#include "DolphinWX/WxUtils.h"
+
#include "Core/NetPlayClient.h"
#include "Core/NetPlayProto.h"
#include "Core/NetPlayServer.h"
-#include "DolphinWX/NetPlay/PadMapDialog.h"
-#include "DolphinWX/WxUtils.h"
PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClient* client)
: wxDialog(parent, wxID_ANY, _("Controller Ports")), m_pad_mapping(server->GetPadMapping()),