Merge tag 'mass_rename' into master_slic3rPE_PR

# "resolved" Conflicts:
#	lib/Slic3r/GUI/Plater.pm
#	lib/Slic3r/GUI/Plater/2DToolpaths.pm
#	lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
#	lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
#	lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
#	lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
#	src/libslic3r/EdgeGrid.cpp
#	src/libslic3r/EdgeGrid.hpp
#	src/libslic3r/ExPolygon.cpp
#	src/libslic3r/ExtrusionEntity.hpp
#	src/libslic3r/ExtrusionEntityCollection.hpp
#	src/libslic3r/Fill/Fill.cpp
#	src/libslic3r/Fill/FillBase.cpp
#	src/libslic3r/Flow.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/ToolOrdering.cpp
#	src/libslic3r/GCode/WipeTowerPrusaMM.cpp
#	src/libslic3r/Geometry.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Model.cpp
#	src/libslic3r/MultiPoint.cpp
#	src/libslic3r/MultiPoint.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PerimeterGenerator.hpp
#	src/libslic3r/Polyline.cpp
#	src/libslic3r/Polyline.hpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/libslic3r/SupportMaterial.cpp
#	src/libslic3r/TriangleMesh.cpp
#	src/libslic3r/TriangleMesh.hpp
#	src/libslic3r/Utils.hpp
#	src/libslic3r/utils.cpp
#	src/slic3r/AppController.hpp
#	src/slic3r/AppControllerWx.cpp
#	src/slic3r/GUI/3DScene.cpp
#	src/slic3r/GUI/GUI.cpp
#	src/slic3r/GUI/GUI.hpp
#	src/slic3r/GUI/Preset.cpp
#	src/slic3r/GUI/ProgressIndicator.hpp
#	src/slic3r/GUI/Tab.hpp
#	xs/CMakeLists.txt
#	xs/src/libslic3r/Layer.hpp
#	xs/src/libslic3r/Line.cpp
#	xs/src/libslic3r/Line.hpp
#	xs/src/libslic3r/Point.hpp
#	xs/src/libslic3r/Print.hpp
#	xs/src/libslic3r/PrintRegion.cpp
#	xs/src/slic3r/AppController.cpp
#	xs/xsp/AppController.xsp
#	xs/xsp/GUI.xsp
#	xs/xsp/Print.xsp

2 files changed, 0 insertions, 72 deletions

diff --git a/t/svg.t b/t/svg.t
deleted file mode 100644
index 47d24ceb8..000000000
--- a/t/svg.t
+++ /dev/null
@@ -1,37 +0,0 @@
-use Test::More tests => 2;
-use strict;
-use warnings;
-
-BEGIN {
-    use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
-}
-
-use Slic3r;
-use Slic3r::Test;
-use IO::Scalar;
-
-{
-    my $print = Slic3r::Test::init_print('20mm_cube');
-    eval {
-        my $fh = IO::Scalar->new(\my $gcode);
-        $print->print->export_svg(output_fh => $fh, quiet => 1);
-        $fh->close;
-    };
-    die $@ if $@;
-    ok !$@, 'successful SVG export';
-}
-
-{
-    my $print = Slic3r::Test::init_print('two_hollow_squares');
-    eval {
-        my $fh = IO::Scalar->new(\my $gcode);
-        $print->print->export_svg(output_fh => $fh, quiet => 1);
-        $fh->close;
-    };
-    die $@ if $@;
-    ok !$@, 'successful SVG export of object with two islands';
-}
-
-__END__
diff --git a/t/threads.t b/t/threads.t
deleted file mode 100644
index 7fede3328..000000000
--- a/t/threads.t
+++ /dev/null
@@ -1,35 +0,0 @@
-use Test::More tests => 2;
-use strict;
-use warnings;
-
-BEGIN {
-    use FindBin;
-    use lib "$FindBin::Bin/../lib";
-    use local::lib "$FindBin::Bin/../local-lib";
-}
-
-use List::Util qw(first);
-use Slic3r;
-use Slic3r::Test;
-
-{
-    my $print = Slic3r::Test::init_print('20mm_cube');
-    {
-        my $thread = threads->create(sub { Slic3r::thread_cleanup(); return 1; });
-        ok $thread->join, "print survives thread spawning";
-    }
-}
-    
-{
-    my $thread = threads->create(sub {
-        {
-            my $print = Slic3r::Test::init_print('20mm_cube');
-            Slic3r::Test::gcode($print);
-        }
-        Slic3r::thread_cleanup();
-        return 1;
-    });
-    ok $thread->join, "process print in a separate thread";
-}
-
-__END__