Merge branch 'master' into plater2

Conflicts: lib/Slic3r/GUI/Plater.pm
2013-08-25 16:10:53 +02:00
parent 87b54ba2a0 2fb725405f
commit 5b734f4a13
13 changed files with 292 additions and 72 deletions
--- a/Build.PL
+++ b/Build.PL
@@ -30,7 +30,7 @@ my %recommends = qw(
 );
 if (defined $ARGV[0] && $ARGV[0] eq '--gui') {
    %prereqs = qw(
-    Wx                              0.9901
+    Wx                              0.9918
    );
    %recommends = qw(
    Wx::GLCanvas                    0