juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main and resolved conflicts

Browse Source
This commit is contained in:
Lam Wei Lun
2026-09-09 11:05:52 +08:00
parent c6ab725584 0f5891f25d
commit a4c399d250
4617 changed files with 33044 additions and 16293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/MainFrame.hpp
-1
View File
@@ -94,7 +94,6 @@ class SettingsDialog : public DPIDialog//DPIDialog
{
//wxNotebook* m_tabpanel { nullptr };
Notebook* m_tabpanel{ nullptr };
MainFrame* m_main_frame { nullptr };
wxMenuBar* m_menubar{ nullptr };
public:
SettingsDialog(MainFrame* mainframe);