mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-31 04:31:15 -06:00 
			
		
		
		
	Merge correction
This commit is contained in:
		
							parent
							
								
									eb9917536c
								
							
						
					
					
						commit
						290e3e66c0
					
				
					 1 changed files with 7 additions and 2 deletions
				
			
		|  | @ -716,8 +716,10 @@ ConfigOptionsGroup* get_optgroup() | |||
| } | ||||
| 
 | ||||
| 
 | ||||
| wxButton* get_wiping_dialog_button(){ | ||||
| wxButton* get_wiping_dialog_button() | ||||
| { | ||||
| 	return g_wiping_dialog_button; | ||||
| } | ||||
| 
 | ||||
| wxWindow* export_option_creator(wxWindow* parent) | ||||
| { | ||||
|  | @ -762,6 +764,9 @@ int get_export_option(wxFileDialog* dlg) | |||
|     } | ||||
| 
 | ||||
|     return 0; | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| } } | ||||
| 
 | ||||
| } // namespace GUI
 | ||||
| } // namespace Slic3r
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Lukas Matena
						Lukas Matena