Merge branch 'background-slice-now' of https://github.com/lordofhyphens/slic3r into background-slice-now

Browse Source

Conflicts:
	lib/Slic3r/GUI/MainFrame.pm
	lib/Slic3r/GUI/Plater.pm

...

This commit is contained in:

Joseph Lenox 2016-11-24 12:59:51 -06:00

parent 9c4e82cecf a020cd1316

commit 4e33766aea

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available