1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-13 08:24:27 +00:00

Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri
2019-04-12 08:41:59 +02:00
20 changed files with 445 additions and 114 deletions
+1
View File
@@ -1079,6 +1079,7 @@ void Selection::paste_from_clipboard()
case Instance:
{
paste_objects_from_clipboard();
break;
}
}