Fixed conflicts after merging with branch eigenize

This commit is contained in:
Enrico Turri committed 2018-08-23 15:37:38 +02:00
commit 66ce638439
211 files changed
+4306 -4917

No files matched your search

+1
View File
@@ -1,4 +1,5 @@
# Bed shape dialog
# still used by the Slic3r::GUI::Controller::ManualControlDialog Perl module.
package Slic3r::GUI::2DBed;
use strict;