Merge branch 'new-gui'

Conflicts:
	lib/Slic3r.pm
	lib/Slic3r/Config.pm
	lib/Slic3r/GUI/OptionsGroup.pm
	lib/Slic3r/GUI/SkeinPanel.pm
	lib/Slic3r/Print.pm
This commit is contained in:
Alessandro Ranellucci 2012-07-18 15:48:04 +02:00
commit f173096a6c
32 changed files with 1854 additions and 450 deletions

View file

@ -24,6 +24,7 @@ my $build = Module::Build->new(
},
recommends => {
'Growl::GNTP' => '0.15',
'Net::DBus' => '0',
'Wx' => '0.9901',
},
script_files => ['slic3r.pl'],