Merge branch 'new_cooling_logic'

2018-04-26 19:00:49 +02:00
parent 3cd7987af4 25d47c1da8
commit 7a8f68cfe6
64 changed files with 5906 additions and 1363 deletions
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -278,5 +278,6 @@ sub system_info
 # this package declaration prevents an ugly fatal warning to be emitted when
 # spawning a new thread
 package GLUquadricObjPtr;
+package Wx::Printout;

 1;