diff options
| author | skidau <skidau@gmail.com> | 2015-03-28 10:11:29 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-28 10:11:29 +1100 |
| commit | 74f25ad8ecef9315add7983f7c98b182a7771e45 (patch) | |
| tree | 2f2f467c6f8bd4b27a4d9f779ef6e08ac9f265f6 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | a2c4abcae891f02cbea2607daa2819692c159a58 (diff) | |
| parent | b459a8ec61c1c10f4484edaa02908f9ed90b1e15 (diff) | |
Merge pull request #2234 from lioncash/config
DolphinWX: Break up ConfigMain into separate classes.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 65689012dd..544263ab7f 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -65,7 +65,6 @@ #include "DiscIO/NANDContentLoader.h" #include "DolphinWX/AboutDolphin.h" -#include "DolphinWX/ConfigMain.h" #include "DolphinWX/ControllerConfigDiag.h" #include "DolphinWX/FifoPlayerDlg.h" #include "DolphinWX/Frame.h" @@ -81,6 +80,7 @@ #include "DolphinWX/WXInputBase.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Cheats/CheatsWindow.h" +#include "DolphinWX/Config/ConfigMain.h" #include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/WatchWindow.h" |
