Joseph Lenox a9b3b0ab7f Merge remote-tracking branch 'thethirdone/Scene3D' into test-merge-thethirdone-3d-plater ...

# Conflicts:
#	.gitignore
#	.travis.yml
#	README.md
#	package/linux/travis-setup.sh
#	src/CMakeLists.txt
#	src/GUI/ColorScheme/Default.hpp
#	src/GUI/Plater.cpp
#	src/GUI/Plater/Plate2D.cpp
#	src/GUI/Plater/Plate3D.hpp
#	src/GUI/Plater/Preview3D.hpp
#	src/GUI/Preset.hpp
#	src/GUI/misc_ui.cpp
#	src/GUI/misc_ui.hpp
#	src/slic3r.cpp
#	src/test/GUI/test_field_checkbox.cpp
#	xs/src/libslic3r/Config.cpp
#	xs/src/libslic3r/Config.hpp
#	xs/src/libslic3r/ConfigBase.cpp
#	xs/src/libslic3r/ConfigBase.hpp
#	xs/src/libslic3r/Log.hpp

2018-07-17 17:35:05 -05:00

..

common

Pillar config (#4410)

2018-05-12 20:03:50 -05:00

deploy

Don't abort if no symlink exists.

2018-02-24 21:42:21 -06:00

linux

Merge remote-tracking branch 'thethirdone/Scene3D' into test-merge-thethirdone-3d-plater

2018-07-17 17:35:05 -05:00

osx

Pillar config (#4410)

2018-05-12 20:03:50 -05:00

win

Oops, syntax error in packaging script.

2017-05-31 23:42:18 -05:00