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

@ -27,9 +27,11 @@ lib/Slic3r/GCode.pm
lib/Slic3r/Geometry.pm
lib/Slic3r/Geometry/Clipper.pm
lib/Slic3r/GUI.pm
lib/Slic3r/GUI/ConfigWizard.pm
lib/Slic3r/GUI/Plater.pm
lib/Slic3r/GUI/OptionsGroup.pm
lib/Slic3r/GUI/SkeinPanel.pm
lib/Slic3r/GUI/Tab.pm
lib/Slic3r/Layer.pm
lib/Slic3r/Line.pm
lib/Slic3r/Point.pm
@ -60,3 +62,30 @@ utils/stl-to-amf.pl
var/Slic3r.icns
var/Slic3r.ico
var/Slic3r.png
var/Slic3r_128px.png
var/add.png
var/arrow_out.png
var/arrow_rotate_anticlockwise.png
var/arrow_rotate_clockwise.png
var/arrow_up.png
var/box.png
var/brick_add.png
var/brick_delete.png
var/brick_go.png
var/bricks.png
var/building.png
var/cog.png
var/cog_go.png
var/cross.png
var/delete.png
var/funnel.png
var/hourglass.png
var/layers.png
var/note.png
var/page_white_go.png
var/printer_empty.png
var/shading.png
var/shape_ungroup.png
var/spool.png
var/time.png
var/wrench.png