Alessandro Ranellucci 1064c9bb2a Merge branch 'master' into grow-narrow ... Conflicts: lib/Slic3r/Fill.pm lib/Slic3r/Print/Object.pm		2013-03-17 02:30:20 +01:00
..
Slic3r	Merge branch 'master' into grow-narrow	2013-03-17 02:30:20 +01:00
Slic3r.pm	Fix honeycomb infill overlap with perimeters	2013-03-17 00:57:58 +01:00