Merge branch 'xs-config'

Conflicts:
	lib/Slic3r/Config.pm
	xs/MANIFEST
This commit is contained in:
Alessandro Ranellucci 2013-12-22 01:41:55 +01:00
commit ab25cc4940
19 changed files with 2370 additions and 1235 deletions

View file

@ -187,7 +187,7 @@ if (@ARGV) { # slicing from command line
sub usage {
my ($exit_code) = @_;
my $config = Slic3r::Config->new_from_defaults;
my $config = Slic3r::Config->new_from_defaults->as_hash;
my $j = '';
if ($Slic3r::have_threads) {