Merge branch 'call_get_layer' of github.com:sapir/Slic3r into sapir-call_get_layer

Conflicts:
	lib/Slic3r/Print.pm
This commit is contained in:
Alessandro Ranellucci 2014-06-14 00:05:24 +02:00
commit e24b3a8916
4 changed files with 39 additions and 38 deletions

File diff suppressed because one or more lines are too long