Alessandro Ranellucci f173096a6c 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		2012-07-18 15:48:04 +02:00
..
Slic3r	Merge branch 'new-gui'	2012-07-18 15:48:04 +02:00
Slic3r.pm	Merge branch 'new-gui'	2012-07-18 15:48:04 +02:00