mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 20:28:56 +00:00
Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master
This commit is contained in:
commit
c18016e795
767 changed files with 87644 additions and 70168 deletions
|
@ -18,6 +18,7 @@ class QStackedWidget;
|
|||
class QString;
|
||||
|
||||
class AchievementsWindow;
|
||||
class AssemblerWidget;
|
||||
class BreakpointWidget;
|
||||
struct BootParameters;
|
||||
class CheatsManager;
|
||||
|
@ -176,6 +177,7 @@ private:
|
|||
|
||||
#ifdef USE_RETRO_ACHIEVEMENTS
|
||||
void ShowAchievementsWindow();
|
||||
void ShowAchievementSettings();
|
||||
#endif // USE_RETRO_ACHIEVEMENTS
|
||||
|
||||
void NetPlayInit();
|
||||
|
@ -260,6 +262,7 @@ private:
|
|||
AchievementsWindow* m_achievements_window = nullptr;
|
||||
#endif // USE_RETRO_ACHIEVEMENTS
|
||||
|
||||
AssemblerWidget* m_assembler_widget;
|
||||
BreakpointWidget* m_breakpoint_widget;
|
||||
CodeWidget* m_code_widget;
|
||||
JITWidget* m_jit_widget;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue