3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed conflicts after merge with master

Browse source
This commit is contained in:
Enrico Turri 2019-04-12 08:41:59 +02:00
commit 3e902ecfbd
20 changed files with 445 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/Selection.cpp
View file

@ -1079,6 +1079,7 @@ void Selection::paste_from_clipboard()
case Instance:
{
paste_objects_from_clipboard();
break;
}
}