Merge branch 'stable' (no conflicts fixed)

2022-04-27 22:24:07 +02:00 · 2022-04-27 22:24:07 +02:00 · 09fe421fe8
commit 09fe421fe8
parent 2377349e7f d7105dabf1
32 changed files with 7409 additions and 5368 deletions
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@ -377,7 +377,6 @@ public:

    void            update_wiping_button_visibility();
 	void			activate_option(const std::string& opt_key, const wxString& category);
-    void			apply_searcher();
 	void			cache_config_diff(const std::vector<std::string>& selected_options);
 	void			apply_config_from_cache();