Merge branch 'master' of https://github.com/alexrj/slic3r

Browse Source

Conflicts:
	package/linux/make_archive.sh

...

This commit is contained in:

Joseph Lenox 2017-04-02 16:59:04 -05:00

parent d08dd487fc 01afaa0ec6

commit 90623c4170

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