Merge branch 'xs-config'

Browse Source

Conflicts:
	lib/Slic3r/Config.pm
	xs/MANIFEST

...

This commit is contained in:

Alessandro Ranellucci

2013-12-22 01:41:55 +01:00

parent 1b9079ffbe c0070a8d54

commit ab25cc4940

19 changed files with 2370 additions and 1235 deletions

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

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

xs/src/PrintConfig.hpp

+1307

File diff suppressed because it is too large Load Diff