Alessandro Ranellucci a5787cfb04 Merge branch 'xs-reload-object' ... Conflicts: lib/Slic3r/Print.pm		2014-11-12 22:51:48 +01:00
..
Slic3r	Merge branch 'xs-reload-object'	2014-11-12 22:51:48 +01:00
Slic3r.pm	Ported PlaceholderParser::update_timestamp() to XS	2014-11-09 20:41:43 +01:00